[GNUnet-SVN] r25728 - gnunet-planetlab/gplmt

[gnunet]

Author: wachs
Date: 2013-01-09 10:59:44 +0100 (Wed, 09 Jan 2013)
New Revision: 25728

Modified:
   gnunet-planetlab/gplmt/gplmt.py
Log:
changes


Modified: gnunet-planetlab/gplmt/gplmt.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt.py     2013-01-09 09:34:50 UTC (rev 25727)
+++ gnunet-planetlab/gplmt/gplmt.py     2013-01-09 09:59:44 UTC (rev 25728)
@@ -111,41 +111,46 @@
         else:
             main.logger = Util.Logger (False)
             
-        if (main.config_file == ""):
-            print "No configuration file given!\n"
-            usage()
-            sys.exit(1)                      
-            
-    # Load configuration file
-        configuration = Configuration.Configuration (main.config_file, 
main.logger);
-        if (configuration.load() == False):
-            sys.exit(2)
+        if (main.config_file != ""):                            
+            # Load configuration file
+            configuration = Configuration.Configuration (main.config_file, 
main.logger);
+            if (configuration.load() == False):
+                print "Failed to load configuration..."
+                sys.exit(2)
+        else:
+            # Load default configuration file
+            configuration = Configuration.Configuration (None, main.logger);
+            if (configuration.load() == False):
+                print "Failed to load default configuration..."
+                sys.exit(2)
+                
+        # Update configuration
+        if (True == main.pl_use_nodes):
+            configuration.pl_use_nodes = True        
+        if ("" != main.pl_password):
+            configuration.pl_password = main.pl_password
+        if ("" != main.tasks_file):
+            configuration.taskfile = main.tasks_file
         
+        
         # command line beats configuration
-        if ((main.nodes_file == "") and (main.pl_use_nodes == False) and 
(main.single_host == None)):
+        if ((main.nodes_file == "") and (configuration.pl_use_nodes == False) 
and (main.single_host == None)):
             if (configuration.nodesfile != ""):
                 main.nodes_file = configuration.nodesfile
             else: 
                 print "No nodes file given!\n"
                 usage()
                 sys.exit(3)
-        
-        if (main.tasks_file == ""):
-            if (configuration.taskfile != ""):
-                main.tasks_file = configuration.taskfile
-            else: 
-                print "No tasks file given!\n"
-                usage()
-                sys.exit(4)
+        if (configuration.taskfile  == ""):
+            print "No tasks file given!\n"
+            usage()
+            sys.exit(4)
                 
-        if ((True == main.pl_use_nodes) and (main.pl_password != None)):
-            configuration.pl_password = main.pl_password
-        if ((True == main.pl_use_nodes) and (main.pl_password == None)):
-            while ((main.pl_password == None) or (main.pl_password == "")):
+        if ((True == configuration.pl_use_nodes) and 
(configuration.pl_password == None)):
+            while ((configuration.pl_password == None) or 
(configuration.pl_password == "")):
                 print "Please enter PlanetLab password:"            
-                main.pl_password = getpass.getpass()
-                main.pl_password = main.pl_password.strip()
-            configuration.pl_password = main.pl_password        
+                configuration.pl_password = getpass.getpass()
+                configuration.pl_password = configuration.pl_password.strip()  
     
     # Load hosts files
         if (main.single_host != None):