Make gclient_scm.py use cache_dir

gclient.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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 1811 matching lines @@
     optparse.OptionParser.__init__(
         self, version='%prog ' + __version__, **kwargs)
 
     # Some arm boards have issues with parallel sync.
     if platform.machine().startswith('arm'):
       jobs = 1
     else:
       jobs = max(8, gclient_utils.NumLocalCpus())
     # cmp: 2013/06/19
     # Temporary workaround to lower bot-load on SVN server.
-    if os.environ.get('CHROME_HEADLESS') == '1':
+    # Bypassed if a bot_update flag is detected.
+    if (os.environ.get('CHROME_HEADLESS') == '1' and
+        not os.path.exists('update.flag')):
       jobs = 1
 
     self.add_option(
         '-j', '--jobs', default=jobs, type='int',
         help='Specify how many SCM commands can run in parallel; defaults to '
              'number of cpu cores (%default)')
     self.add_option(
         '-v', '--verbose', action='count', default=0,
         help='Produces additional output for diagnostics. Can be used up to '
              'three times for more logging info.')
@@ skipping 76 matching lines @@
     raise
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: