From 8be37beabcbaef276a45a44ff94c8ea293c3f05a Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Mon, 14 Jan 2013 10:21:34 +0000 Subject: Don't use logs for check-system when running out of buildbot It's interactive so it needs stdin. --- (limited to 'commands') 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) -- cgit v0.9.1