From bc97374582ac8498e9992779c07ca9c59f6e13c1 Mon Sep 17 00:00:00 2001
From: James Ball <quic_jameball@quicinc.com>
Date: Wed, 18 Dec 2024 11:57:56 -0800
Subject: [PATCH] Fixes to portfolio after merge of big ugly patch and "do"
 file bugs when running in a container or avoiding using a container for
 clean.

---
 do                               | 14 ++++++--------
 lib/arch_obj_models/portfolio.rb | 10 +++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/do b/do
index 57ae6f102..92ed0e671 100755
--- a/do
+++ b/do
@@ -1,15 +1,13 @@
 #!/bin/bash
 
 ROOT=$(dirname $(realpath $BASH_SOURCE[0]))
-if [ -v DEVCONTAINER_ENV ]; then
-  BUNDLE=bundle
-else
-  source $ROOT/bin/setup
-fi
 
 if [ "$1" == "clean" ]; then
   ${ROOT}/bin/clean
-else
-  # really long way of invoking rake, but renamed to 'do'
-  $BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
+  exit $?
 fi
+
+source $ROOT/bin/setup
+
+# really long way of invoking rake, but renamed to 'do'
+$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
diff --git a/lib/arch_obj_models/portfolio.rb b/lib/arch_obj_models/portfolio.rb
index 1b9ca4aaf..3e1d1442a 100644
--- a/lib/arch_obj_models/portfolio.rb
+++ b/lib/arch_obj_models/portfolio.rb
@@ -79,10 +79,10 @@ def version_greatest_presence(ext_name, ext_versions)
       greatest_presence = nil
 
       in_scope_ext_reqs.each do |ext_req|
-        if ext_req.satisfied_by?(ext_name, v.version)
+        if ext_req.satisfied_by?(v)
           presence = extension_presence_obj(ext_name)
 
-          unless presence.nil? 
+          unless presence.nil?
             if greatest_presence.nil?
               greatest_presence = presence
             elsif presence > greatest_presence
@@ -127,11 +127,11 @@ def in_scope_ext_reqs(desired_presence = nil)
     @data["extensions"]&.each do |ext_name, ext_data|
       next if ext_name[0] == "$"
 
-      # Does extension even exist? 
+      # Does extension even exist?
       # If not, don't raise an error right away so we can find all of the missing extensions and report them all.
-      ext = arch_def.extension(ext_name)
+      ext = cfg_arch.extension(ext_name)
       if ext.nil?
-        puts "Extension #{ext_name} for #{name} not found in database" 
+        puts "Extension #{ext_name} for #{name} not found in database"
         missing_ext = true
       end