Fix accessing of non-existent exception attribute in error handler

Fixed: 1488385
Change-Id: Ie401b1580091aa1ad31091e71e55b59e26e6fdc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4931232
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
changes/32/4931232/3
Philipp Thiel 2 years ago committed by LUCI CQ
parent ce4aac950f
commit f2449cd841

@ -945,7 +945,7 @@ class GitWrapper(SCMWrapper):
# case 4b
force_switch = True
else:
switch_error = '%s\n%s' % (e.message, switch_error)
switch_error = '%s\n%s' % (str(e), switch_error)
if force_switch:
self.Print("Switching upstream branch from %s to %s" %
(upstream_branch, new_base))
@ -1104,7 +1104,7 @@ class GitWrapper(SCMWrapper):
# origin. See also http://crbug.com/520067.
logging.warning(
"Couldn't find usable revision, will retrying to update instead: %s",
e.message)
str(e))
return self.update(options, [], file_list)
if file_list is not None:

Loading…
Cancel
Save