fix: force load SmalltalkCI in images that already contain it

hpi-swa · Sep 18, 2024 · 0d9b005 · 0d9b005
1 parent bb26ccf
commit 0d9b005
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gtoolkit/run.sh b/gtoolkit/run.sh
@@ -180,7 +180,7 @@ gtoolkit::load_project() {
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
+        [ metacello load ] on: MetacelloIgnorePackageLoaded do: [ :ex | ex resume: true ] ]
             on: Warning
             do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
@@ -209,7 +209,7 @@ gtoolkit::test_project() {
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
+                [ metacello load ] on: MetacelloIgnorePackageLoaded do: [ :ex | ex resume: true ] ]
                     on: Warning
                     do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].

diff --git a/pharo/run.sh b/pharo/run.sh
@@ -371,7 +371,7 @@ pharo::load_project() {
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
+        [ metacello load ] on: MetacelloIgnorePackageLoaded do: [ :ex | ex resume: true ] ]
             on: Warning
             do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
@@ -399,7 +399,7 @@ pharo::test_project() {
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
+                [ metacello load ] on: MetacelloIgnorePackageLoaded do: [ :ex | ex resume: true ] ]
                     on: Warning
                     do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].