diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-04-08 23:44:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-08 23:44:30 +0000 |
| commit | d93c45fca67dbd11512e248464ce138462051054 (patch) | |
| tree | 0937c2ede4411d7f8a16a536b35475c527858089 /contrib | |
| parent | af482da7fcc56b7721024cd773e98761ab31eccd (diff) | |
| parent | 54d646fb7e2030a064b0f11a86c084371ddb2145 (diff) | |
Merge "TrivialRebase: Fix pylint errors" into stable-2.6
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/trivial_rebase.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py index 215f2b1958..e41d8361eb 100755 --- a/contrib/trivial_rebase.py +++ b/contrib/trivial_rebase.py @@ -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: + changeId = re.search(r'\d+', args.changeUrl).group() + 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 |