Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-01-14 10:21:34 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2013-01-14 10:21:34 (GMT)
commit8be37beabcbaef276a45a44ff94c8ea293c3f05a (patch)
treed658d3bb9078e9b5de4ea29c70ac19d75ed11b28 /devbot
parentec56e7ec7d9ed7e85b6f97de133e518b7714e657 (diff)
Don't use logs for check-system when running out of buildbot
It's interactive so it needs stdin.
Diffstat (limited to 'devbot')
-rw-r--r--devbot/command.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/devbot/command.py b/devbot/command.py
index 050f809..0d9c809 100644
--- a/devbot/command.py
+++ b/devbot/command.py
@@ -9,18 +9,19 @@ def run(args, test=False, retry=0):
print " ".join(args)
return
+ log_file = None
+ subprocess_args = {"args": args}
+
if config.log_path:
- stdout = open(config.log_path, "a")
- stderr = subprocess.STDOUT
- else:
- stdout = None
- stderr = None
+ log_file = open(config.log_path, "a")
+ subprocess_args["stdout"] = log_file
+ subprocess_args["stderr"] = subprocess.STDOUT
tries = 0
while tries < retry + 1:
try:
tries = tries + 1
- subprocess.check_call(args, stdout=stdout, stderr=stderr)
+ subprocess.check_call(**subprocess_args)
break
except subprocess.CalledProcessError, e:
print "\nCommand failed, tail of %s\n" % config.log_path
@@ -33,8 +34,8 @@ def run(args, test=False, retry=0):
else:
raise e
- if stdout:
- stdout.close()
+ if log_file:
+ log_file.close()
def run_with_sudo(args, test=False, retry=0):