r279 - trunk/scripts

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-05-17 12:13:45 -0400 (Thu, 17 May 2007)
New Revision: 279

Modified:
   trunk/scripts/mojosetup_mainline.lua
Log:
Whoops, rollback deletion was very very broken.


Modified: trunk/scripts/mojosetup_mainline.lua
===================================================================
--- trunk/scripts/mojosetup_mainline.lua	2007-05-17 16:08:18 UTC (rev 278)
+++ trunk/scripts/mojosetup_mainline.lua	2007-05-17 16:13:45 UTC (rev 279)
@@ -46,6 +46,19 @@
     end
 end
 
+local function delete_rollbacks()
+    if MojoSetup.rollbacks == nil then
+        return
+    end
+    local fnames = {}
+    local max = #MojoSetup.rollbacks
+    for id = 1,max,1 do
+        fnames[id] = MojoSetup.rollbackdir .. "/" .. id
+    end
+    MojoSetup.rollbacks = {}   -- just in case this gets called again...
+    delete_files(fnames)
+end
+
 local function delete_scratchdirs()
     do_delete(MojoSetup.downloaddir)
     do_delete(MojoSetup.rollbackdir)
@@ -70,6 +83,8 @@
         end
         MojoSetup.loginfo("Restored rollback #" .. id .. ": '" .. src .. "' -> '" .. dest .. "'")
     end
+
+    MojoSetup.rollbacks = {}   -- just in case this gets called again...
 end
 
 
@@ -877,7 +892,7 @@
     -- !!! FIXME: write out manifest.
 
     -- Successful install, so delete conflicts we no longer need to rollback.
-    delete_files(MojoSetup.rollbacks)
+    delete_rollbacks()
     delete_files(MojoSetup.downloads)
     delete_scratchdirs()