[zorg] r273712 - Added a default status format string for ninja command.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Fri Jun 24 14:54:20 2016
New Revision: 273712

URL: http://llvm.org/viewvc/llvm-project?rev=273712&view=rev
Log:
Added a default status format string for ninja command.

Modified:
    zorg/trunk/zorg/buildbot/commands/NinjaCommand.py

Modified: zorg/trunk/zorg/buildbot/commands/NinjaCommand.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/NinjaCommand.py?rev=273712&r1=273711&r2=273712&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/NinjaCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/NinjaCommand.py Fri Jun 24 14:54:20 2016
@@ -1,8 +1,6 @@
 from buildbot.process.properties import WithProperties
 from buildbot.steps.shell import WarningCountingShellCommand
 
-from twisted.python import log
-
 class NinjaCommand(WarningCountingShellCommand):
 
     def __init__(self, prefixCommand=None, targets=None, **kwargs):
@@ -30,6 +28,15 @@ class NinjaCommand(WarningCountingShellC
         self.addFactoryArguments(prefixCommand=prefixCommand,
                                  targets=targets)
 
+    def setupEnvironment(self, cmd):
+        # First upcall to get everything prepared.
+        WarningCountingShellCommand.setupEnvironment(self, cmd)
+
+        # Set default status format string.
+        if cmd.args['env'] is None:
+            cmd.args['env'] = {}
+        cmd.args['env']['NINJA_STATUS'] = cmd.args['env'].get('NINJA_STATUS', "%e [%u/%r/%f] ")
+
     def start(self):
         # Don't forget to remove all the empty items from the command,
         # which we could get because of WithProperties rendered as empty strings.