--ignore_deps for apply_issue

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 69 matching lines @@
   parser.add_option('--no-auth', action='store_true',
                     help='Do not attempt authenticated requests.')
   parser.add_option('--revision-mapping', default='{}',
                     help='When running gclient, annotate the got_revisions '
                          'using the revision-mapping.')
   parser.add_option('-f', '--force', action='store_true',
                     help='Really run apply_issue, even if .update.flag '
                          'is detected.')
   parser.add_option('-b', '--base_ref', help='Base git ref to patch on top of, '
                     'used for verification.')
+  parser.add_option('-d', '--ignore_deps', action='store_true',
+                    help='Don\'t run gclient sync on DEPS changes.')
   options, args = parser.parse_args()
 
   if options.password and options.private_key_file:
     parser.error('-k and -w options are incompatible')
   if options.email and options.email_file:
     parser.error('-e and -E options are incompatible')
 
   if (os.path.isfile(os.path.join(os.getcwd(), 'update.flag'))
       and not options.force):
     print 'update.flag file found: bot_update has run and checkout is already '
@@ skipping 111 matching lines @@
     scm_obj.apply_patch(
         patchset, verbose=True,
         email=properties.get('owner_email', 'chrome-bot@chromium.org'),
         name=properties.get('owner', 'chrome-bot'))
   except checkout.PatchApplicationFailed, e:
     print(str(e))
     print('CWD=%s' % os.getcwd())
     print('Checkout path=%s' % scm_obj.project_path)
     return 1
 
-  if 'DEPS' in map(os.path.basename, patchset.filenames):
+  if ('DEPS' in map(os.path.basename, patchset.filenames)
+      and not options.ignore_deps):
     gclient_root = gclient_utils.FindGclientRoot(full_dir)
     if gclient_root and scm_type:
       print(
           'A DEPS file was updated inside a gclient checkout, running gclient '
           'sync.')
       base_rev = 'BASE' if scm_type == 'svn' else 'HEAD'
       gclient_path = os.path.join(BASE_DIR, 'gclient')
       if sys.platform == 'win32':
         gclient_path += '.bat'
       with annotated_gclient.temp_filename(suffix='gclient') as f:
@@ skipping 13 matching lines @@
               f, options.revision_mapping)
           annotated_gclient.emit_buildprops(revisions)
 
         return retcode
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())