From fac9d3d690142365e7fa9042a5fd773aaad3293f Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Fri, 10 Sep 2010 20:38:49 +0000 Subject: [PATCH] Give up on parallel checkout by default. It hoses the chromium slaves on build.webkit.org. It was fun while it lasted. TBR=bradnelson TEST=none BUG=none Review URL: http://codereview.chromium.org/3350018 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59146 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gclient.py b/gclient.py index 9721f426a..9eec5d8b7 100644 --- a/gclient.py +++ b/gclient.py @@ -1175,15 +1175,7 @@ def Main(argv): ' %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip()) for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')])) parser = optparse.OptionParser(version='%prog ' + __version__) - # TODO(maruel): Temporary workaround to disable parallel checkout on - # buildbots until they can correctly parse its output. stdout being - # redirected is not a good signal, at least on linux. Check for environment - # variable instead. - if 'CHROME_HEADLESS' not in os.environ: - jobs = 8 - else: - jobs = 1 - parser.add_option('-j', '--jobs', default=jobs, type='int', + parser.add_option('-j', '--jobs', default=1, type='int', help='Specify how many SCM commands can run in parallel; ' 'default=%default') parser.add_option('-v', '--verbose', action='count', default=0,