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

[gnunet]

Author: wachs
Date: 2013-01-08 18:02:53 +0100 (Tue, 08 Jan 2013)
New Revision: 25717

Modified:
   gnunet-planetlab/gplmt/gplmt/Configuration.py
Log:
support default cfg: ~/.gplmt/gplmt.conf


Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-01-08 17:02:08 UTC 
(rev 25716)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-01-08 17:02:53 UTC 
(rev 25717)
@@ -54,7 +54,15 @@
         self.ssh_password = ""
         self.ssh_use_known_hosts = False
         self.ssh_transfer = TransferMode.scp
-    def load (self):        
+    def load (self):
+        if (None == self.filename):            
+            default_cfg = os.path.expanduser("~") + os.sep + ".gplmt" + 
os.sep+ "gplmt.conf"
+            if (False == os.path.exists (default_cfg)):
+                print "Default configuration " +default_cfg+ " not found"
+                return False
+            else:
+                self.logger.log ("Default configuration " +default_cfg+ " 
found")
+                self.filename = default_cfg
         self.logger.log ("Loading configuration file '" + self.filename + "'")
         if (False == os.path.exists (self.filename)):
             print "File does not exist: '" + self.filename + "'"