[cig-commits] r7585 - in cs/buildbot/trunk/buildbot: . scripts

[leif at geodynamics.org]

Author: leif
Date: 2007-07-02 00:09:01 -0700 (Mon, 02 Jul 2007)
New Revision: 7585

Modified:
   cs/buildbot/trunk/buildbot/config.py
   cs/buildbot/trunk/buildbot/scripts/shipper.py
Log:
The progress meter is always off in scp's batch mode ("-v" does no
good).  Increased timeout instead.



Modified: cs/buildbot/trunk/buildbot/config.py
===================================================================
--- cs/buildbot/trunk/buildbot/config.py	2007-07-01 23:15:33 UTC (rev 7584)
+++ cs/buildbot/trunk/buildbot/config.py	2007-07-02 07:09:01 UTC (rev 7585)
@@ -113,6 +113,7 @@
               workdir=workdir,
               env=env,
               haltOnFailure=True,
+              timeout=2*3600, # My laptop doesn't always have a fast connection.
               ),
             ]
         

Modified: cs/buildbot/trunk/buildbot/scripts/shipper.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/shipper.py	2007-07-01 23:15:33 UTC (rev 7584)
+++ cs/buildbot/trunk/buildbot/scripts/shipper.py	2007-07-02 07:09:01 UTC (rev 7585)
@@ -22,6 +22,6 @@
     command = "chmod go+r " + files
     print command
     os.system(command)
-    command = "scp -v -o BatchMode=yes " + files + " www.geodynamics.org:/home/buildbot/public_html/shipping"
+    command = "scp -o BatchMode=yes " + files + " www.geodynamics.org:/home/buildbot/public_html/shipping"
     print command
     os.system(command)