upload.py: Fix undefined variable bug.
BUG=chromium:356813
TEST=None
R=vadimsh@chromium.org, stip@chromium.org
Review URL: https://codereview.chromium.org/1060633003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294704 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/third_party/upload.py b/third_party/upload.py
index c9a45b5..1101f26 100755
--- a/third_party/upload.py
+++ b/third_party/upload.py
@@ -372,32 +372,33 @@
authentication cookie, it returns a 401 response (or a 302) and
directs us to authenticate ourselves with ClientLogin.
"""
- INTERNAL_ERROR_MAP = {
- "badauth": "BadAuthentication",
- "cr": "CaptchaRequired",
- "adel": "AccountDeleted",
- "adis": "AccountDisabled",
- "sdis": "ServiceDisabled",
- "ire": "ServiceUnavailable",
- }
-
for i in range(3):
credentials = self.auth_function()
# Try external, then internal.
e = None
+ error_map = None
try:
auth_token = self._GetAuthToken(credentials[0], credentials[1])
except urllib2.HTTPError:
try:
+ # Try internal endpoint.
+ error_map = {
+ "badauth": "BadAuthentication",
+ "cr": "CaptchaRequired",
+ "adel": "AccountDeleted",
+ "adis": "AccountDisabled",
+ "sdis": "ServiceDisabled",
+ "ire": "ServiceUnavailable",
+ }
auth_token = self._GetAuthToken(credentials[0], credentials[1],
internal=True)
except ClientLoginError, exc:
e = exc
if e:
print >> sys.stderr, ''
- if internal:
- e.reason = INTERNAL_ERROR_MAP.get(e.reason, e.reason)
+ if error_map:
+ e.reason = error_map.get(e.reason, e.reason)
if e.reason == "BadAuthentication":
if e.info == "InvalidSecondFactor":
print >> sys.stderr, (
