r496 - trunk/scripts

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-02-20 05:20:36 -0500 (Wed, 20 Feb 2008)
New Revision: 496

Modified:
   trunk/scripts/mojosetup_mainline.lua
Log:
Try to delete the metadatadir with the rest of the scratchdir cleanup,
 ignoring if it fails to remove it since it might still be in use.

Fixes empty metadata dir sticking around in installs where we don't want it,
 if there was a rollback or download written out during the installation.


Modified: trunk/scripts/mojosetup_mainline.lua
===================================================================
--- trunk/scripts/mojosetup_mainline.lua	2008-02-20 10:18:39 UTC (rev 495)
+++ trunk/scripts/mojosetup_mainline.lua	2008-02-20 10:20:36 UTC (rev 496)
@@ -191,7 +191,8 @@
 local function delete_scratchdirs()
     do_delete(MojoSetup.downloaddir)
     do_delete(MojoSetup.rollbackdir)
-    do_delete(MojoSetup.scratchdir)  -- must be last!
+    do_delete(MojoSetup.scratchdir)  -- must be after dirs it contains!
+    do_delete(MojoSetup.metadatadir)  -- must be last! (and is okay to fail.)
 end