diff options
| author | msw <msw@chromium.org> | 2015-06-04 20:14:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 03:15:00 +0000 |
| commit | 5fa927e2c6ae4f26d265d85723af8710961cbec3 (patch) | |
| tree | df3d39ac2581350fab4d7b404123d89568ec0b77 | |
| parent | ee0e5afcdb605346ac619b0eced7ab4db10abf18 (diff) | |
| download | chromium_src-5fa927e2c6ae4f26d265d85723af8710961cbec3.zip chromium_src-5fa927e2c6ae4f26d265d85723af8710961cbec3.tar.gz chromium_src-5fa927e2c6ae4f26d265d85723af8710961cbec3.tar.bz2 | |
Fix a rev_sdk.py presubmit warning.
Rename a conflicting variable (error below).
Introduced in https://codereview.chromium.org/1157843002
** Presubmit Warnings **
Pylint (16 files) (2.50s) failed
************* Module rev_sdk
W: 47,34: Redefining name 'mojo_revision' from outer scope (line 100) (redefined-outer-name)
BUG=NONE
TEST=No python presubmit warnings; rev_sdk.py works as expected.
R=rockot@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1160793006
Cr-Commit-Position: refs/heads/master@{#333002}
| -rwxr-xr-x | mojo/tools/rev_sdk.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mojo/tools/rev_sdk.py b/mojo/tools/rev_sdk.py index 0ca317fb..db81034 100755 --- a/mojo/tools/rev_sdk.py +++ b/mojo/tools/rev_sdk.py @@ -96,10 +96,5 @@ if len(sys.argv) < 2: sys.exit(1) # Allow override of the roll revision. -if len(sys.argv) == 3: - mojo_revision = sys.argv[2] -else: - mojo_revision = 'origin/HEAD' - -rev(sys.argv[1], chromium_root_dir, mojo_revision) - +revision = sys.argv[2] if len(sys.argv) == 3 else 'origin/HEAD' +rev(sys.argv[1], chromium_root_dir, revision) |