Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/commands
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 /commands
parentec56e7ec7d9ed7e85b6f97de133e518b7714e657 (diff)
Don't use logs for check-system when running out of buildbot
It's interactive so it needs stdin.
Diffstat (limited to 'commands')
-rwxr-xr-xcommands/check-system7
-rw-r--r--commands/common.py6
2 files changed, 10 insertions, 3 deletions
diff --git a/commands/check-system b/commands/check-system
index 63b86ed..4429d90 100755
--- a/commands/check-system
+++ b/commands/check-system
@@ -22,4 +22,9 @@ check_args = {"update": args.update,
"interactive": interactive,
"lazy": False}
-common.setup(log_name="check-system", check_args=check_args)
+setup_args = {"check_args": check_args}
+
+if not interactive:
+ setup_args["log_name"] = "check-system"
+
+common.setup(**setup_args)
diff --git a/commands/common.py b/commands/common.py
index 62b53b5..c09da54 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -16,8 +16,10 @@ def setup(log_name=None, check_args={}):
"state_dir": os.path.join(base_dir, "state"),
"prefs_path": os.path.join(base_dir, "prefs"),
"logs_dir": os.path.join(base_dir, "logs"),
- "relocatable": "SUGAR_BUILDBOT" in os.environ,
- "log_name": log_name}
+ "relocatable": "SUGAR_BUILDBOT" in os.environ}
+
+ if log_name:
+ config_args["log_name"] = log_name
if not main.setup(config_args, check_args):
sys.exit(1)