Merge "TrivialRebase: Fix pylint errors" into stable-2.6

This commit is contained in:
David Pursehouse 2013-04-08 23:44:30 +00:00 committed by Gerrit Code Review
commit d93c45fca6

View File

@ -149,9 +149,8 @@ def Main():
"[default: %(default)s]")
args = parser.parse_known_args()[0]
try:
changeId = re.search(r'\d+', args.changeUrl).group()
except:
if changeId is None:
parser.print_help()
exit(0)
@ -169,7 +168,7 @@ def Main():
if not prev_patch_id:
print "GetPatchId failed for commit %s" % (prev_revision)
if not cur_patch_id:
print "GetPatchId failed for commit %s" % (options.commit)
print "GetPatchId failed for commit %s" % (args.commit)
exit(0)
if cur_patch_id.split()[0] != prev_patch_id.split()[0]:
# patch-ids don't match