From a116e7d373994f43370b7cceffb3da194493170f Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 5 Oct 2010 19:58:02 +0000 Subject: [PATCH] Workaround to disable Progress() on buildbot by disabling it on --verbose. sys.stdout.isatty() is True even on buildbot. Otherwise, logs can't be untangled when using --jobs. TEST=none BUG=none Review URL: http://codereview.chromium.org/3596006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61552 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gclient.py b/gclient.py index cd269cb66..9cf30c76c 100644 --- a/gclient.py +++ b/gclient.py @@ -716,7 +716,8 @@ solutions = [ revision_overrides = self._EnforceRevisions() pm = None # Disable progress for non-tty stdout. - if command in ('update', 'revert') and sys.stdout.isatty(): + if (command in ('update', 'revert') and sys.stdout.isatty() and not + self._options.verbose): pm = Progress('Syncing projects', 1) work_queue = gclient_utils.ExecutionQueue(self._options.jobs, pm) for s in self.dependencies: