apply_issue: catch all Rietveld flakiness failures.

apply_issue.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Applies an issue from Rietveld.
 """
 
 import getpass
 import json
@@ skipping 185 matching lines @@
           num, options.server, issue_to_apply, patchset_to_apply)
       num += 1
     print
 
   for issue_to_apply, patchset_to_apply in issues_patchsets_to_apply:
     issue_url = '%s/%d/#ps%d' % (options.server, issue_to_apply,
                                  patchset_to_apply)
     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') % (
               issue_to_apply, patchset_to_apply,
               options.server, issue_to_apply)
       # Special code for bot_update to indicate that cause is network or
       # Rietveld. Not 2, because 2 is returned on arg parsing failure.
       return 3
     if options.whitelist:
       patchset.patches = [patch for patch in patchset.patches
@@ skipping 61 matching lines @@
           annotated_gclient.emit_buildprops(revisions)
 
         return retcode
   return 0
 
 
 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)