MCPackageLoader.st
branchjv
changeset 1117 5287516fa71d
parent 940 64e03d517590
child 1166 e9b369305a8d
--- a/MCPackageLoader.st	Tue Sep 01 10:26:57 2020 +0100
+++ b/MCPackageLoader.st	Tue Sep 01 20:33:47 2020 +0100
@@ -1,5 +1,10 @@
+"
+COPYRIGHT (c) 2020 LabWare
+"
 "{ Package: 'stx:goodies/monticello' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#MCPackageLoader
 	instanceVariableNames:'requirements unloadableDefinitions overrideDefinitions
 		obsoletions additions removals errorDefinitions provisions'
@@ -8,6 +13,15 @@
 	category:'SCM-Monticello-Loading'
 !
 
+!MCPackageLoader class methodsFor:'documentation'!
+
+copyright
+"
+COPYRIGHT (c) 2020 LabWare
+
+
+"
+! !
 
 !MCPackageLoader class methodsFor:'initialization'!
 
@@ -92,6 +106,9 @@
 
         [[
         | oldErrorDefinitions |
+        additions := MCDefinition sortForLoading: additions.
+        removals := (MCDefinition sortForLoading: removals) reversed.
+
         additions do: [:ea | self tryToLoad: ea] displayingProgress: 'Loading...'.
         removals do: [:ea | ea unload] displayingProgress: 'Cleaning up...'.
         self shouldWarnAboutErrors ifTrue: [self warnAboutErrors].
@@ -115,6 +132,7 @@
 
     "Modified: / 08-11-2010 / 23:49:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 20-08-2011 / 18:20:54 / cg"
+    "Modified: / 01-09-2020 / 19:56:55 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 dependencyWarning
@@ -378,6 +396,11 @@
     ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackageLoader.st,v 1.10 2014-12-11 15:51:20 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id: MCPackageLoader.st,v 1.10 2014-12-11 15:51:20 cg Exp $'
 ! !