[Buildbot-commits] buildbot/buildbot/steps shell.py, 1.17, 1.18 transfer.py, 1.12, 1.13

[Brian Warner]

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

Modified Files:
	shell.py transfer.py 
Log Message:
[project @ rename 'render' to 'render_properties', more cleanups]

Original author: warner at lothar.com
Date: 2008-03-21 03:52:21+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- shell.py	21 Mar 2008 01:34:27 -0000	1.17
+++ shell.py	21 Mar 2008 03:53:36 -0000	1.18
@@ -2,7 +2,8 @@
 
 import types, re
 from twisted.python import log
-from buildbot.process.buildstep import LoggingBuildStep, RemoteShellCommand, render
+from buildbot.process.buildstep import LoggingBuildStep, RemoteShellCommand, \
+     render_properties
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE
 
 # for existing configurations that import WithProperties from here
@@ -121,7 +122,7 @@
         if isinstance(words, types.StringTypes):
             words = words.split()
         # render() each word to handle WithProperties objects
-        words = [render(word, self.build) for word in words]
+        words = [render_properties(word, self.build) for word in words]
         if len(words) < 1:
             return ["???"]
         if len(words) == 1:
@@ -160,7 +161,7 @@
         return value.render(self.build)
 
     def _interpolateWorkdir(self, workdir):
-        return render(workdir, self.build)
+        return render_properties(workdir, self.build)
 
     def setupEnvironment(self, cmd):
         # merge in anything from Build.slaveEnvironment . Earlier steps

Index: transfer.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/transfer.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- transfer.py	20 Mar 2008 23:57:04 -0000	1.12
+++ transfer.py	21 Mar 2008 03:53:36 -0000	1.13
@@ -4,7 +4,8 @@
 from twisted.internet import reactor
 from twisted.spread import pb
 from twisted.python import log
-from buildbot.process.buildstep import RemoteCommand, BuildStep, render
+from buildbot.process.buildstep import RemoteCommand, BuildStep, \
+     render_properties
 from buildbot.process.buildstep import SUCCESS, FAILURE
 from buildbot.interfaces import BuildSlaveTooOldError
 
@@ -114,21 +115,20 @@
             m = "slave is too old, does not know about uploadFile"
             raise BuildSlaveTooOldError(m)
 
-        source = render(self.slavesrc, self.build)
-        masterdest = render(self.masterdest, self.build)
+        source = render_properties(self.slavesrc, self.build)
+        masterdest = render_properties(self.masterdest, self.build)
         # we rely upon the fact that the buildmaster runs chdir'ed into its
         # basedir to make sure that relative paths in masterdest are expanded
         # properly. TODO: maybe pass the master's basedir all the way down
         # into the BuildStep so we can do this better.
-        target = os.path.expanduser(masterdest)
+        masterdest = os.path.expanduser(masterdest)
         log.msg("FileUpload started, from slave %r to master %r"
-                % (source, target))
+                % (source, masterdest))
 
         self.step_status.setColor('yellow')
         self.step_status.setText(['uploading', os.path.basename(source)])
 
         # we use maxsize to limit the amount of data on both sides
-        # XXX should that be 'masterdest' or 'target'?
         fileWriter = _FileWriter(masterdest, self.maxsize, self.mode)
 
         # default arguments
@@ -244,8 +244,9 @@
 
         # we are currently in the buildmaster's basedir, so any non-absolute
         # paths will be interpreted relative to that
-        source = os.path.expanduser(render(self.mastersrc, self.build))
-        slavedest = render(self.slavedest, self.build)
+        source = os.path.expanduser(render_properties(self.mastersrc,
+                                                      self.build))
+        slavedest = render_properties(self.slavedest, self.build)
         log.msg("FileDownload started, from master %r to slave %r" %
                 (source, slavedest))