[Buildbot-commits] buildbot/buildbot/slave commands.py,1.68,1.69

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6047/buildbot/slave

Modified Files:
	commands.py 
Log Message:
[project @ filetransfer: code cleanups]

Original author: warner at lothar.com
Date: 2006-10-13 07:28:48

Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- commands.py	30 Sep 2006 19:32:48 -0000	1.68
+++ commands.py	13 Oct 2006 07:29:58 -0000	1.69
@@ -675,14 +675,12 @@
     Upload a file from slave to build master
     Arguments:
 
-        - ['workdir']:   directory to use
-        - ['slavesrc']:  name of the file to upload to the buildmaster
-        - ['writer']:    object for remote writing
+        - ['workdir']:   base directory to use
+        - ['slavesrc']:  name of the slave-side file to read from
+        - ['writer']:    RemoteReference to a transfer._FileWriter object
         - ['maxsize']:   max size (in bytes) of file to write
-        - ['blocksize']: max size for one data block
-
+        - ['blocksize']: max size for each data block
     """
-
     debug = False
 
     def setup(self,args):
@@ -786,12 +784,11 @@
     Download a file from master to slave
     Arguments:
 
-        - ['workdir']:   directory to use
-        - ['slavedest']: name of the file to upload to the buildmaster
-        - ['reader']:    object for remote reading
+        - ['workdir']:   base directory to use
+        - ['slavedest']: name of the slave-side file to be created
+        - ['reader']:    RemoteReference to a transfer._FileReader object
         - ['maxsize']:   max size (in bytes) of file to write
-        - ['blocksize']: max size for one data block
-
+        - ['blocksize']: max size for each data block
     """
     debug = False
 
@@ -815,7 +812,7 @@
             self.fp = open(self.path, 'w')
             if self.debug:
                 log.msg('Opened %r for download' % self.path)
-        except:
+        except IOError:
             self.fp = None
             self.stderr = 'Cannot open file %r for download' % self.path
             self.rc = 1