Merge jaredgrubb/buildbot:ShellMixinLogs9 (PR #1566)

buildbot · Mar 1, 2015 · f412772 · f412772
2 parents 6ab32d4 + efa1a3c
commit f412772
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py
@@ -1091,7 +1091,12 @@ def makeRemoteShellCommand(self, collectStdout=False, collectStderr=False,
         kwargs.update(overrides)
         stdio = None
         if stdioLogName is not None:
-            stdio = yield self.addLog(stdioLogName)
+            # Reuse an existing log if possible; otherwise, create one.
+            try:
+                stdio = yield self.getLog(stdioLogName)
+            except KeyError:
+                stdio = yield self.addLog(stdioLogName)
+
         kwargs['command'] = flatten(kwargs['command'], (list, tuple))
 
         # store command away for display
@@ -1124,7 +1129,11 @@ def makeRemoteShellCommand(self, collectStdout=False, collectStderr=False,
         kwargs['workdir'] = self.workdir
 
         # the rest of the args go to RemoteShellCommand
-        cmd = remotecommand.RemoteShellCommand(**kwargs)
+        cmd = remotecommand.RemoteShellCommand(
+            collectStdout=collectStdout,
+            collectStderr=collectStderr,
+            **kwargs
+        )
 
         # set up logging
         if stdio is not None: