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

[gnunet]

Author: wachs
Date: 2013-05-16 10:11:53 +0200 (Thu, 16 May 2013)
New Revision: 27163

Modified:
   gnunet-planetlab/gplmt/gplmt/Nodes.py
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
comments in node files


Modified: gnunet-planetlab/gplmt/gplmt/Nodes.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 07:54:53 UTC (rev 
27162)
+++ gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 08:11:53 UTC (rev 
27163)
@@ -41,6 +41,10 @@
 
     @staticmethod
     def parse(line):
+        parts = line.split('#') # allow comments 
+        if len(parts) > 1: #credentials supplied
+            line = parts[0]
+        line = line.replace(" ", "")
         parts = line.split('@')
         hostname = None
         port = None

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 07:54:53 UTC (rev 
27162)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 08:11:53 UTC (rev 
27163)
@@ -294,17 +294,17 @@
             
             if self.node.username is not None: #credentials are supplied in 
node file
                 if (self.node.password is not None):                    
-                    g_logger.log (self.node.hostname + " : Trying to connect 
to " + 
+                    g_logger.log (self.node.hostname + " : Trying to connect 
to '" + 
                                   self.node.username + "@" + 
self.node.hostname + 
-                                  " using password '" + 
str(self.node.password))
+                                  "' using password '" + 
str(self.node.password))
                     ssh.connect (self.node.hostname,
                                  port=self.node.port or 22,
                                  username=self.node.username,
                                  password=self.node.password,
                                  timeout=10)
                 else:
-                    g_logger.log (self.node.hostname + " : Trying to connect 
to " + 
-                                  self.node.username + "@" + 
self.node.hostname)
+                    g_logger.log (self.node.hostname + " : Trying to connect 
to '" + 
+                                  self.node.username + "@" + 
self.node.hostname + "'")
                     ssh.connect (self.node.hostname,
                                  port=self.node.port or 22,
                                  username=self.node.username,
@@ -312,9 +312,9 @@
                     
 
             elif ("" != g_configuration.ssh_username):
-                g_logger.log (self.node.hostname + " : Trying to connect to " 
+ 
+                g_logger.log (self.node.hostname + " : Trying to connect to '" 
+ 
                           g_configuration.ssh_username + "@" + 
self.node.hostname + 
-                          " using password '" + g_configuration.ssh_password+ 
+                          "' using password '" + g_configuration.ssh_password+ 
                           "' and private keyfile '" +str(keyfile)+ "'")
                 ssh.connect (self.node.hostname,
                        port=self.node.port or 22,