[haizea-commit] r520 - trunk/src/haizea/resourcemanager

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2008-09-25 13:30:08 -0500 (Thu, 25 Sep 2008)
New Revision: 520

Modified:
   trunk/src/haizea/resourcemanager/configfile.py
Log:
Missing configfile documentation

Modified: trunk/src/haizea/resourcemanager/configfile.py
===================================================================
--- trunk/src/haizea/resourcemanager/configfile.py	2008-09-25 18:29:48 UTC (rev 519)
+++ trunk/src/haizea/resourcemanager/configfile.py	2008-09-25 18:30:08 UTC (rev 520)
@@ -88,7 +88,6 @@
             required    = False,
             default     = constants.DEPLOYMENT_UNMANAGED,
             valid       = [constants.DEPLOYMENT_UNMANAGED,
-                           constants.DEPLOYMENT_PREDEPLOY,
                            constants.DEPLOYMENT_TRANSFER],
             doc         = """
             Sets how the scheduler will handle the
@@ -455,7 +454,8 @@
             type        = OPTTYPE_TIMEDELTA,
             required    = False,
             doc         = """
-            Documentation                
+            Forces the image transfer time to a specific amount.
+            This options is intended for testing purposes.                
             """),
             
      Option(name        = "diskimage-reuse",
@@ -716,11 +716,8 @@
                     profileconfig.set("tracefile", "tracefile", tracefile)
                     
                     # Add injected file option
-                    if injectfile == None:
-                        inj = "None"
-                    else:
-                        inj = injectfile
-                    profileconfig.set("tracefile", "injectionfile", inj)
+                    if injectfile != None:
+                        profileconfig.set("tracefile", "injectionfile", injectfile)
 
                     # Add datafile option
                     datadir = self.config.get(self.MULTI_SEC, self.DATADIR_OPT)