r260 - trunk/scripts

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-05-14 22:57:25 -0400 (Mon, 14 May 2007)
New Revision: 260

Modified:
   trunk/scripts/mojosetup_init.lua
   trunk/scripts/mojosetup_mainline.lua
Log:
Let you disable entire Setup.Package installers.


Modified: trunk/scripts/mojosetup_init.lua
===================================================================
--- trunk/scripts/mojosetup_init.lua	2007-05-12 15:19:43 UTC (rev 259)
+++ trunk/scripts/mojosetup_init.lua	2007-05-15 02:57:25 UTC (rev 260)
@@ -293,6 +293,7 @@
     tab = sanitize("Package", tab,
     {
         { "id", nil, mustExist, mustBeString, cantBeEmpty },
+        { "disabled", nil, mustBeBool },
         { "description", nil, mustExist, mustBeString, cantBeEmpty },
         { "version", nil, mustExist, mustBeString, cantBeEmpty },
         { "destination", nil, mustBeString, cantBeEmpty },

Modified: trunk/scripts/mojosetup_mainline.lua
===================================================================
--- trunk/scripts/mojosetup_mainline.lua	2007-05-12 15:19:43 UTC (rev 259)
+++ trunk/scripts/mojosetup_mainline.lua	2007-05-15 02:57:25 UTC (rev 260)
@@ -847,12 +847,13 @@
 --  so it only spits out crap if debug-level logging is enabled.
 MojoSetup.dumptable("MojoSetup.installs", MojoSetup.installs)
 
--- !!! FIXME: is MojoSetup.installs just nil? Should we lose saw_an_installer?
 local saw_an_installer = false
 for installkey,install in pairs(MojoSetup.installs) do
-    saw_an_installer = true
-    do_install(install)
-    MojoSetup.collectgarbage()  -- nuke all the tables we threw around...
+    if not install.disabled then
+        saw_an_installer = true
+        do_install(install)
+        MojoSetup.collectgarbage()  -- nuke all the tables we threw around...
+    end
 end
 
 if not saw_an_installer then