[GNUnet-SVN] r33027 - eclectic/gplmt/gplmt

[gnunet]

Author: otarabai
Date: 2014-04-10 15:44:11 +0200 (Thu, 10 Apr 2014)
New Revision: 33027

Modified:
   eclectic/gplmt/gplmt/SCP.py
   eclectic/gplmt/gplmt/Worker.py
Log:
fix in GPLMT get directive


Modified: eclectic/gplmt/gplmt/SCP.py
===================================================================
--- eclectic/gplmt/gplmt/SCP.py 2014-04-10 13:05:53 UTC (rev 33026)
+++ eclectic/gplmt/gplmt/SCP.py 2014-04-10 13:44:11 UTC (rev 33027)
@@ -315,7 +315,10 @@
         try:
             mode = int(parts[0], 8)
             size = int(parts[1])
-            path = os.path.join(self._recv_dir, parts[2])
+            if os.path.isdir(self._recv_dir):
+                path = os.path.join(self._recv_dir, parts[2])
+            else:
+                path = self._recv_dir
         except:
             chan.send('\x01')
             chan.close()

Modified: eclectic/gplmt/gplmt/Worker.py
===================================================================
--- eclectic/gplmt/gplmt/Worker.py      2014-04-10 13:05:53 UTC (rev 33026)
+++ eclectic/gplmt/gplmt/Worker.py      2014-04-10 13:44:11 UTC (rev 33027)
@@ -560,17 +560,19 @@
             g_logger.log (self.node.hostname + " : Task '"+ message)
             return TaskExecutionResult(Tasks.Taskresult.user_interrupt, 
"interrupted by user", "")
         try:
+            base = os.path.basename(task.src)
+            dest = os.path.join(task.dest, '%s.%s' % (self.node.hostname, 
base))
             if (g_configuration.ssh_transfer == 
Configuration.TransferMode.scp): 
                 try:
                     scp = SCPClient (self.transport)
-                    scp.get (task.src, task.dest)
+                    scp.get (task.src, dest)
                 except SCPException as e:
                     g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' :")
                     result = TaskExecutionResult(Tasks.Taskresult.fail, 
str(e), "")  
                     pass                
             if (g_configuration.ssh_transfer == 
Configuration.TransferMode.sftp):
                 sftp = paramiko.SFTPClient.from_transport (self.transport)
-                sftp.get (task.src, task.dest)
+                sftp.get (task.src, dest)
                 sftp.close()
         except paramiko.SSHException as e:
             g_logger.log (self.node.hostname + " : Task '"+ task.name + "' :" 
+ str(e))