[Nym3-commit] r457 - trunk/nymbaron/Server

[zax at conuropsis.org]

Author: zax
Date: 2006-03-08 10:21:17 +0100 (Wed, 08 Mar 2006)
New Revision: 457

Modified:
   trunk/nymbaron/Server/Main.py
Log:
Correct indentation in load_config.  I probably broke it during conflict resolve.


Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2006-03-08 01:16:08 UTC (rev 456)
+++ trunk/nymbaron/Server/Main.py	2006-03-08 09:21:17 UTC (rev 457)
@@ -78,14 +78,14 @@
     """Load the configuration"""
     global config
     try:
-	os.stat(Config.SYSFILE)
-	config = Config.Config(Config.SYSFILE)
+        os.stat(Config.SYSFILE)
+        config = Config.Config(Config.SYSFILE)
     except OSError:
-	try:
-	    os.stat(Config.userfile())
-	    config = Config.Config(Config.userfile())
-	except OSError:
-	    config = Config.Config()
+        try:
+            os.stat(Config.userfile())
+            config = Config.Config(Config.userfile())
+    except OSError:
+        config = Config.Config()
 
 def mapAccount(fun, funargs = None):
     """Applies the function fun to each account of the server. The signature of