AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roll_deps: Return a tuple even when returning early

Browse Source 
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
This commit is contained in:
commit-bot@chromium.org 2014-03-03 17:57:41 +00:00
parent 450d9ef4ac
commit 1b94819fcb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/roll_deps.py
View File

@ -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):