From 95a3849ab813fcba0e9db4e4ab01a4c92677a904 Mon Sep 17 00:00:00 2001 From: "tandrii@chromium.org" Date: Fri, 2 Oct 2015 17:21:52 +0000 Subject: [PATCH] apply_issue: catch all Rietveld flakiness failures. R=iannucci@chromium.org BUG= Review URL: https://codereview.chromium.org/1375343005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296990 0039d316-1c4b-4281-b951-d872f2087c98 --- apply_issue.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apply_issue.py b/apply_issue.py index b4dbd7896..c2a85b1f3 100755 --- a/apply_issue.py +++ b/apply_issue.py @@ -203,9 +203,7 @@ def main(): print('Downloading patch from %s' % issue_url) try: patchset = obj.get_patch(issue_to_apply, patchset_to_apply) - except urllib2.URLError: - logging.exception('failed to fetch the patch for issue %d, patchset %d.', - issue_to_apply, patchset_to_apply) + except urllib2.HTTPError: print( 'Failed to fetch the patch for issue %d, patchset %d.\n' 'Try visiting %s/%d') % ( @@ -287,6 +285,10 @@ if __name__ == "__main__": fix_encoding.fix_encoding() try: sys.exit(main()) + except urllib2.URLError: + # Weird flakiness of GAE, see http://crbug.com/537417 + logging.exception('failed to fetch something from Rietveld') + sys.exit(3) except KeyboardInterrupt: sys.stderr.write('interrupted\n') sys.exit(1)