[GNUnet-SVN] r25773 - in gnunet-planetlab/gplmt: contrib/tasklists gplmt

[gnunet]

Author: wachs
Date: 2013-01-14 13:25:56 +0100 (Mon, 14 Jan 2013)
New Revision: 25773

Modified:
   gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
 changes


Modified: gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml     
2013-01-14 12:08:20 UTC (rev 25772)
+++ gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml     
2013-01-14 12:25:56 UTC (rev 25773)
@@ -20,7 +20,7 @@
         <stop_on_fail>false</stop_on_fail>
        </run> 
        <put id="1" name="put gnunet.conf">
-               <source>default_pl.conf</source>
+               <source>contrib/gnunet.conf</source>
                
<destination>/home/tumple_gnunet/.gnunet/gnunet.conf</destination>
                <stop_on_fail>true</stop_on_fail>
        </put> 

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-01-14 12:08:20 UTC (rev 
25772)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-01-14 12:25:56 UTC (rev 
25773)
@@ -22,23 +22,28 @@
 #
 # Worker
 
+import threading
+import socket
+import os
+import time
+import sys
+import select
+import signal
+
+
+
+
 try:
-    import gplmt.Configuration as TransferMode
+    import gplmt.Configuration as Configuration
     import gplmt.Tasks as Tasks
-
-    import threading
-    import socket
-    import os
-    import time
-    import sys
-    import select
-    import signal
     from gplmt.SCP import SCPClient
-
-except ImportError: 
-    print "That's a bug! please check README" 
+except ImportError as e: 
+    print "That's a bug! please check README: " + str(e)  
     sys.exit(1)
+    
 
+
+
 interrupt = False
 def signal_handler(signal, frame):
     global interrupt
@@ -215,10 +220,10 @@
             
         result = Tasks.Taskresult.success
         try:
-            if (g_configuration.ssh_transfer == TransferMode.scp):
+            if (g_configuration.ssh_transfer == 
Configuration.TransferMode.scp):
                 scp = SCPClient (transport)
                 scp.put (task.src, task.dest)
-            if (g_configuration.ssh_transfer == TransferMode.sftp):            
    
+            if (g_configuration.ssh_transfer == 
Configuration.TransferMode.sftp):                
                 sftp = paramiko.SFTPClient.from_transport (transport)
                 sftp.put(task.src, task.dest)
                 sftp.close()
@@ -235,10 +240,10 @@
     def exec_get (self, task, transport):
         result = Tasks.Taskresult.success
         try:
-            if (g_configuration.ssh_transfer == TransferMode.scp): 
+            if (g_configuration.ssh_transfer == 
Configuration.TransferMode.scp): 
                 scp = SCPClient (transport)
                 scp.get (task.src, task.dest)
-            if (g_configuration.ssh_transfer == TransferMode.sftp):
+            if (g_configuration.ssh_transfer == 
Configuration.TransferMode.sftp):
                 sftp = paramiko.SFTPClient.from_transport (transport)
                 sftp.get (task.src, task.dest)
                 sftp.close()
@@ -296,7 +301,6 @@
             return
         
         g_notifications.node_connected (self.node, True)
-        
         transport = ssh.get_transport()        
         success = True
         result = Tasks.Taskresult.success