Changeset 4135 for trunk/umit_scheduler.py

Timestamp:

02/20/09 03:04:09 (4 years ago)

Author:

gpolo

Message:

* Explicitly fail when a path has no change to succeed in
Path.force_set_umit_conf;
* No longer always using force_set_umit_conf in umit_scheduler, that
only happens when explicitly told so.

Files:

• trunk/umit_scheduler.py (modified) (3 diffs)

trunk/umit_scheduler.py

@@ -67 +67 @@
 
 
-def setup_homedir(usethis):
+def setup_homedir(usethis, force=False):
     """
     Setting umit home directory.
     """
-    Path.force_set_umit_conf(usethis)
+    if force:
+        Path.force_set_umit_conf(usethis)
+    else:
+        Path.set_umit_conf(usethis)
 
     global HOME_CONF, RUNNING_FILE
@@ -117 +120 @@
 
     if CONFIG_DIR: # forcing especified dir
-        setup_homedir(CONFIG_DIR)
+        setup_homedir(CONFIG_DIR, force=True)
     else:
         try:
-            setup_homedir(sys.argv[2])
+            setup_homedir(sys.argv[2], force=True)
         except IndexError: # no path especified
-            setup_homedir(os.path.join(os.path.expanduser("~"), '.umit'))
+            setup_homedir(os.path.expanduser("~"))
 
     return main(sys.argv[1:])
@@ -129 +132 @@
 if FROZEN_CFG is not None:
     def write_frozen_cfg():
-        setup_homedir(os.path.join(os.path.expanduser('~'), '.umit'))
+        setup_homedir(os.path.expanduser('~'))
         conf = open(FROZEN_CFG, 'w')
         conf.write(HOME_CONF)