From 725929e4b2dad321f42ed70c144811efb77b5fb3 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Fri, 15 Jun 2012 19:40:17 +0000 Subject: When running under buildbot avoid interactions --- (limited to 'scripts') diff --git a/scripts/check-system b/scripts/check-system index 7484713..0801656 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -2,6 +2,7 @@ import os import subprocess +import sys binaries = [{ "name": "git", "packages": { "fedora": "git", @@ -154,6 +155,10 @@ for info in imports: if packages: args = ["sudo"] + if "SUGAR_BUILDBOT" in os.environ: + print "Missing packages %s" % " ".join(packages) + sys.exit(1) + if distro == "fedora": args.extend(["yum", "install"]) elif distro == "ubuntu": diff --git a/scripts/jhbuildrc b/scripts/jhbuildrc index f2491d0..cb63887 100644 --- a/scripts/jhbuildrc +++ b/scripts/jhbuildrc @@ -3,6 +3,8 @@ import os def root(): return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +interact = not "SUGAR_BUILDBOT" in os.environ + use_local_modulesets = True moduleset = [os.path.join(root(), "scripts", "system.modules"), os.path.join(root(), "scripts", "sugar.modules")] -- cgit v0.9.1