bot_update (+recipe_module): treat patch download as infra failure.

scripts/slave/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 1562 matching lines @@
       print 'We failed gclient sync, lets delete the checkout and retry.'
       ensure_no_checkout(dir_names, '*')
       gclient_output = ensure_checkout(**checkout_parameters)
   except PatchFailed as e:
     if options.output_json:
       # Tell recipes information such as root, got_revision, etc.
       emit_json(options.output_json,
                 did_run=True,
                 root=first_sln,
                 log_lines=[('patch error', e.output),],
+                patch_apply_return_code=e.code,
                 patch_root=options.patch_root,
                 patch_failure=True,
                 step_text='%s PATCH FAILED' % step_text)
     else:
       # If we're not on recipes, tell annotator about our got_revisions.
       emit_log_lines('patch error', e.output)
       print '@@@STEP_TEXT@%s PATCH FAILED@@@' % step_text
     raise
 
   # Revision is an svn revision, unless it's a git master.
@@ skipping 80 matching lines @@
 
   try:
     # Dun dun dun, the main part of bot_update.
     revisions, step_text = prepare(options, git_slns, active)
     checkout(options, git_slns, specs, buildspec, master, svn_root, revisions,
              step_text)
 
   except Inactive:
     # Not active, should count as passing.
     pass
-  except PatchFailed:
+  except PatchFailed as e:
     emit_flag(options.flag_file)
     # Return a specific non-zero exit code for patch failure (because it is
     # a failure), but make it different than other failures to distinguish
     # between infra failures (independent from patch author), and patch
-    # failures (that patch author can fix).
+    # failures (that patch author can fix). However, PatchFailure due to
+    # download patch failure is still an infra problem.
+    if e.code == 3:
+      # Patch download problem.
+      return 87
+    # Genuine patch problem.
     return 88
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())