[Buildbot-commits] buildbot/buildbot/steps shell.py,1.24,1.25

[Brian Warner]

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

Modified Files:
	shell.py 
Log Message:
[project @ fix-setproperty-step.patch]
Fix the SetProperty step to use the new properties interface, which it missed
due to a reordering of patches.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:29:40+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- shell.py	26 May 2008 23:52:13 -0000	1.24
+++ shell.py	27 May 2008 00:52:21 -0000	1.25
@@ -244,8 +244,8 @@
         if self.property:
             result = cmd.logs['stdio'].getText()
             if self.strip: result = result.strip()
-            propname = render_properties(self.property, self.build)
-            self.setProperty(propname, result)
+            propname = self.build.getProperties().render(self.property)
+            self.setProperty(propname, result, "SetProperty Step")
             self.property_changes[propname] = result
         else:
             log = cmd.logs['stdio']
@@ -253,7 +253,7 @@
                     ''.join(log.getChunks([STDOUT], onlyText=True)),
                     ''.join(log.getChunks([STDERR], onlyText=True)))
             for k,v in new_props.items():
-                self.setProperty(k, v)
+                self.setProperty(k, v, "SetProperty Step")
             self.property_changes = new_props
 
     def createSummary(self, log):