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

[gnunet]

Author: wachs
Date: 2013-07-23 17:33:01 +0200 (Tue, 23 Jul 2013)
New Revision: 28275

Modified:
   gnunet-planetlab/gplmt/gplmt/Configuration.py
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
fix ssh key file issue


Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-07-23 15:25:16 UTC 
(rev 28274)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-07-23 15:33:01 UTC 
(rev 28275)
@@ -110,12 +110,12 @@
         try:          
             try: 
                 # gplmt options
-                self.gplmt_taskfile = config.get("gplmt", "tasks")
+                self.gplmt_taskfile = os.path.expanduser(config.get("gplmt", 
"tasks"))
             except ConfigParser.NoOptionError as e:
                 pass
             
             try: 
-                self.gplmt_nodesfile = config.get("gplmt", "nodes")
+                self.gplmt_nodesfile = os.path.expanduser(config.get("gplmt", 
"nodes"))
             except ConfigParser.NoOptionError as e:
                 pass
 
@@ -139,11 +139,11 @@
             except ConfigParser.NoOptionError as e:
                 pass
             try: 
-                self.bb_task_file = config.get("buildbot", "result_task_file")
+                self.bb_task_file = 
os.path.expanduser(os.path.expanduser(config.get("buildbot", 
"result_task_file")))
             except ConfigParser.NoOptionError as e:
                 pass        
             try: 
-                self.bb_result_cfg = config.get("buildbot", "result_cfg")
+                self.bb_result_cfg = os.path.expanduser(config.get("buildbot", 
"result_cfg"))
             except ConfigParser.NoOptionError as e:
                 pass
             try: 
@@ -192,7 +192,7 @@
             except ConfigParser.NoOptionError as e:
                 pass
             try: 
-                self.ssh_keyfile = config.get("ssh", "ssh_keyfile") 
+                self.ssh_keyfile = os.path.expanduser(config.get("ssh", 
"ssh_keyfile")) 
             except ConfigParser.NoOptionError as e:
                 pass
             try: 

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-23 15:25:16 UTC (rev 
28274)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-23 15:33:01 UTC (rev 
28275)
@@ -619,7 +619,7 @@
         g_logger = logger;        
     def start (self):
         if (0 != self.parallelism):
-            g_logger.log ("Starting execution on target '" + str (self.target))
+            g_logger.log ("Starting execution on target '" + str (self.target) 
+ "'")
         else:
             g_logger.log ("Starting execution on target '" + str (self.target) 
+ "' with a parallelism of " + str (self.parallelism))