Changeset 545 for trunk/daemon/orbited/config.py

Timestamp:

09/20/08 15:44:51 (4 months ago)

Author:

rgl

Message:

Merge the 0.7 branch into trunk.

For now on, trunk will contain the bleeding-edge version of Orbited.

Files:

• trunk/daemon/orbited/config.py (modified) (2 diffs)

trunk/daemon/orbited/config.py

@@ -50 +50 @@
     return True
 
-def setup(argv):
+defaultPaths = [
+    os.path.join('/', 'etc', 'orbited.cfg'),
+    os.path.join('/', 'Program Files', 'Orbited', 'etc', 'orbited.cfg'),
+    'orbited.cfg',
+]
+
+def setup(argv, paths=defaultPaths):
     parser = OptionParser()
     parser.add_option(
@@ -67 +73 @@
     if not options.config:
         # no config file specified, try to search it.
-        paths = [
-            os.path.join('/', 'etc', 'orbited.cfg'),
-            os.path.join('/', 'Program Files', 'Orbited', 'etc', 'orbited.cfg'),
-            'orbited.cfg',
-        ]
         for path in paths:
             if os.path.exists(path):