Bot_update recipe output: Add 'Try Rebasing' to patch failure output

recipe_modules/bot_update/api.py

 # 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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
@@ skipping 258 matching lines @@
         # This is used by the Chromium module to figure out where to look for
         # the checkout.
         # If there is a patch failure, emit another step that said things
         # failed.
         if step_result.json.output.get('patch_failure'):
           return_code = step_result.json.output.get('patch_apply_return_code')
           if return_code == 3:
             # This is download failure, hence an infra failure.
             # Sadly, python.failing_step doesn't support kwargs.
             self.m.python.inline(
-                'Patch failure',
+                'Patch failure - Try Rebasing',
                 ('import sys;'
                  'print "Patch download failed. See bot_update step for'
                  ' details";sys.exit(1)'),
                 infra_step=True,
                 step_test_data=lambda: self.m.raw_io.test_api.output(
                   'Patch download failed. See bot_update step for details',
                   retcode=1)
                 )
           else:
             # This is actual patch failure.
             self.m.tryserver.set_patch_failure_tryjob_result()
             self.m.python.failing_step(
                 'Patch failure', 'Check the bot_update step for details')
 
         # bot_update actually just sets root to be the folder name of the
         # first solution.
         if step_result.json.output['did_run']:
           co_root = step_result.json.output['root']
           cwd = kwargs.get('cwd', self.m.path['slave_build'])
           if 'checkout' not in self.m.path:
             self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result