[or-cvs] r12820: Actually honor configuration options in file. (in bridgedb/trunk: . lib/bridgedb)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-12-14 16:46:56 -0500 (Fri, 14 Dec 2007)
New Revision: 12820

Modified:
   bridgedb/trunk/
   bridgedb/trunk/lib/bridgedb/Main.py
Log:
 r17165@catbus:  nickm | 2007-12-14 16:46:54 -0500
 Actually honor configuration options in file.



Property changes on: bridgedb/trunk
___________________________________________________________________
 svk:merge ticket from /bridgedb/trunk [r17165] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: bridgedb/trunk/lib/bridgedb/Main.py
===================================================================
--- bridgedb/trunk/lib/bridgedb/Main.py	2007-12-14 21:40:35 UTC (rev 12819)
+++ bridgedb/trunk/lib/bridgedb/Main.py	2007-12-14 21:46:56 UTC (rev 12820)
@@ -190,8 +190,10 @@
     else:
         configuration = {}
         execfile(sys.argv[1], configuration)
+        C = Conf(**configuration)
+        configuration = C
 
-    startup(CONFIG)
+    startup(configuration)
 
 if __name__ == '__main__':
     run()