MCPackageLoader.st
branchjv
changeset 1166 e9b369305a8d
parent 1117 5287516fa71d
child 1168 9773b3285492
--- a/MCPackageLoader.st	Tue Sep 20 17:58:07 2022 +0100
+++ b/MCPackageLoader.st	Thu Mar 23 17:21:35 2023 +0000
@@ -1,5 +1,6 @@
 "
 COPYRIGHT (c) 2020 LabWare
+COPYRIGHT (c) 2023 LabWare
 "
 "{ Package: 'stx:goodies/monticello' }"
 
@@ -18,6 +19,7 @@
 copyright
 "
 COPYRIGHT (c) 2020 LabWare
+COPYRIGHT (c) 2023 LabWare
 
 
 "
@@ -341,11 +343,10 @@
 
 !MCPackageLoader methodsFor:'public'!
 
-installSnapshot: aSnapshot
-	| patch |
-	patch := aSnapshot patchRelativeToBase: MCSnapshot empty.
-	patch applyTo: self.
-
+installSnapshot: originalSnapshot
+        | patch |
+        patch := originalSnapshot patchRelativeToBase: MCSnapshot empty.
+        patch applyTo: self.
 !
 
 load
@@ -370,16 +371,16 @@
 	self updatePackage: aPackage withSnapshot: MCSnapshot empty
 !
 
-updatePackage: aPackage withSnapshot: aSnapshot
-        |  patch packageSnap |
+updatePackage: aPackage withSnapshot: originalSnapshot
+        |  patch currentSnapshot |
 
         MCStXPackageQuery 
             answer: aPackage name 
             do:[
-                packageSnap := aPackage snapshot.
-                patch := aSnapshot patchRelativeToBase: packageSnap.
+                currentSnapshot := aPackage snapshot.
+                patch := originalSnapshot patchRelativeToBase: currentSnapshot.
                 patch applyTo: self.
-                packageSnap definitions do: [:ea | self provisions addAll: ea provisions]
+                currentSnapshot definitions do: [:ea | self provisions addAll: ea provisions]
             ]
 
     "Modified: / 14-09-2010 / 22:09:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"