Smalltalk.st
changeset 17320 ae85df732129
parent 17319 3a4e789417fe
child 17322 2656d3c0c690
--- a/Smalltalk.st	Sun Jan 25 06:13:20 2015 +0100
+++ b/Smalltalk.st	Sun Jan 25 12:10:39 2015 +0100
@@ -4237,22 +4237,20 @@
             ].
 
             [
+                idx := CommandLineArguments indexOfAny:#('-pp' '--packagePath').
+                idx ~~ 0
+            ] whileTrue:[
+                arg := CommandLineArguments at:idx + 1.
+                CommandLineArguments removeAtIndex:idx+1; removeAtIndex:idx.
+            ].
+
+            [
                 idx := CommandLineArguments indexOfAny:#('-l' '--load').
                 idx ~~ 0
             ] whileTrue:[
                 arg := CommandLineArguments at:idx + 1.
                 CommandLineArguments removeAtIndex:idx+1; removeAtIndex:idx.
-                Error handle:[:ex |
-                    isRepl ifTrue:[ ex reject ].
-                    thisContext fullPrintAllOn: Stderr.
-                    self exit:1
-                ] do:[
-                    arg asFilename exists ifTrue:[
-                        Smalltalk fileIn:arg
-                    ] ifFalse:[
-                        Smalltalk loadPackage:arg
-                    ].
-                ].
+                self packagePath addLast:arg.
             ].
 
             "/ look for a '-e filename' or '--execute filename' argument
@@ -8294,11 +8292,11 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1097 2015-01-25 05:13:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1098 2015-01-25 11:10:39 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1097 2015-01-25 05:13:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1098 2015-01-25 11:10:39 cg Exp $'
 !
 
 version_SVN