diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-03 17:57:41 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-03 17:57:41 +0000 |
| commit | 1b94819fcbe766039a488ad3975db2e1a8a25e28 (patch) | |
| tree | 53a1a6d2d80bb6008f8dadf5fbed0af7c5a0c37f /tools | |
| parent | 450d9ef4acdb8ad20ceaeff003443a0648784c9a (diff) | |
roll_deps: Return a tuple even when returning early
This fixes the bot going red when DEPS is already up-to-date.
BUG=skia:
R=halcanary@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/185413012
git-svn-id: http://skia.googlecode.com/svn/trunk@13642 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/roll_deps.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/roll_deps.py b/tools/roll_deps.py index 6ee37c32b8..ebecad3396 100755 --- a/tools/roll_deps.py +++ b/tools/roll_deps.py @@ -416,7 +416,7 @@ def roll_deps(config, revision, git_hash): assert old_revision if revision == int(old_revision): print 'DEPS is up to date!' - return None + return (None, None) master_hash = config.vsp.strip_output( [git, 'show-ref', 'origin/master', '--hash']) @@ -506,12 +506,13 @@ def find_hash_and_roll_deps(config, revision=None, partial_hash=None): print 'revision=%r\nhash=%r\n' % (revision, git_hash) - roll = roll_deps(config, revision, git_hash) + deps_issue, whitespace_issue = roll_deps(config, revision, git_hash) - if roll: - deps_issue, whitespace_issue = roll + if deps_issue and whitespace_issue: print 'DEPS roll:\n %s\n' % deps_issue print 'Whitespace change:\n %s\n' % whitespace_issue + else: + print >> sys.stderr, 'No issues created.' def main(args): |