pld-builder.new: PLD_Builder/file_sender.py Store problems only when it hap...

arekm arekm at pld-linux.org
Tue Oct 6 20:41:11 CEST 2009


Author: arekm                        Date: Tue Oct  6 18:41:11 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Store problems only when it happens.

---- Files affected:
pld-builder.new/PLD_Builder:
   file_sender.py (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/file_sender.py
diff -u pld-builder.new/PLD_Builder/file_sender.py:1.37 pld-builder.new/PLD_Builder/file_sender.py:1.38
--- pld-builder.new/PLD_Builder/file_sender.py:1.37	Mon Oct  5 18:22:35 2009
+++ pld-builder.new/PLD_Builder/file_sender.py	Tue Oct  6 20:41:06 2009
@@ -39,8 +39,11 @@
 def scp_file(src, target):
     global problems
     f = os.popen("scp -v -B %s %s 2>&1 < /dev/null" % (src, target))
-    problems[src] = f.read()
-    return f.close()
+    p = f.read()
+    ret = f.close()
+    if ret:
+        problems[src] = f.read()
+    return ret
 
 def copy_file(src, target):
     try:
@@ -69,17 +72,23 @@
         p.close()
         rsync += " --password-file .rsync.pass"
     f = os.popen("%s %s %s 2>&1 < /dev/null" % (rsync, src, target))
-    problems[src] = f.read()
+    p = f.read()
     if password != None:
         os.unlink(".rsync.pass")
-    return f.close()
+    ret = f.close()
+    if ret:
+        problems[src] = p
+    return ret
 
 def rsync_ssh_file(src, target):
     global problems
     rsync = "rsync --verbose --archive -e ssh"
     f = os.popen("%s %s %s 2>&1 < /dev/null" % (rsync, src, target))
-    problems[src] = f.read()
-    return f.close()
+    p = f.read()
+    ret = f.close()
+    if ret:
+        problems[src] = p
+    return ret
 
 def post_file(src, url):
     global problems
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/file_sender.py?r1=1.37&r2=1.38&f=u



More information about the pld-cvs-commit mailing list