Merge pull request #2408 from dinatale2/upstream/logenviron-mastershell

Add logEnviron flag to MasterShellCommand
buildbot · Sep 23, 2016 · fc42c14 · fc42c14
2 parents 122f7da + adc172c
commit fc42c14
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/master/buildbot/steps/master.py b/master/buildbot/steps/master.py
@@ -50,6 +50,7 @@ def __init__(self, command, **kwargs):
         self.env = kwargs.pop('env', None)
         self.usePTY = kwargs.pop('usePTY', 0)
         self.interruptSignal = kwargs.pop('interruptSignal', 'KILL')
+        self.logEnviron = kwargs.pop('logEnviron', True)
 
         BuildStep.__init__(self, **kwargs)
 
@@ -139,7 +140,9 @@ def subst(match):
                                            "lists; key '%s' is incorrect" % (key,))
                     newenv[key] = p.sub(subst, env[key])
             env = newenv
-        stdio_log.addHeader(" env: %r\n" % (env,))
+
+        if self.logEnviron:
+            stdio_log.addHeader(" env: %r\n" % (env,))
 
         # TODO add a timeout?
         self.process = reactor.spawnProcess(self.LocalPP(self), argv[0], argv,