bot_update: Use 'gclient' from same repository.

recipe_modules/bot_update/resources/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 copy
@@ skipping 64 matching lines @@
 cache_dir = r%(cache_dir)s
 %(target_os)s
 %(target_os_only)s
 """
 
 
 # How many times to try before giving up.
 ATTEMPTS = 5
 
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
+GCLIENT_PATH = path.join(DEPOT_TOOLS_DIR, 'gclient.py')
 
 # If there is less than 100GB of disk space on the system, then we do
 # a shallow checkout.
 SHALLOW_CLONE_THRESHOLD = 100 * 1024 * 1024 * 1024
 
 
 class SubprocessFailed(Exception):
   def __init__(self, message, code, output):
     Exception.__init__(self, message)
     self.code = code
@@ skipping 217 matching lines @@
   has_checkout = any(path.exists(path.join(build_dir, dir_name, '.git'))
                      for dir_name in dir_names)
   if has_checkout:
     for filename in os.listdir(build_dir):
       deletion_target = path.join(build_dir, filename)
       print '.git detected in checkout, deleting %s...' % deletion_target,
       remove(deletion_target)
       print 'done'
 
 
+def call_gclient(*args, **kwargs):
+  """Run the "gclient.py" tool with the supplied arguments.
+
+  Args:
+    args: command-line arguments to pass to gclient.
+    kwargs: keyword arguments to pass to call.
+  """
+  cmd = [sys.executable, '-u', GCLIENT_PATH]
+  cmd.extend(args)
+  return call(*cmd, **kwargs)
+
+
 def gclient_configure(solutions, target_os, target_os_only, git_cache_dir):
   """Should do the same thing as gclient --spec='...'."""
   with codecs.open('.gclient', mode='w', encoding='utf-8') as f:
     f.write(get_gclient_spec(
         solutions, target_os, target_os_only, git_cache_dir))
 
 
 def gclient_sync(with_branch_heads, shallow, break_repo_locks):
   # We just need to allocate a filename.
   fd, gclient_output_file = tempfile.mkstemp(suffix='.json')
   os.close(fd)
-  gclient_bin = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
-  cmd = [gclient_bin, 'sync', '--verbose', '--reset', '--force',
+
+  args = ['sync', '--verbose', '--reset', '--force',
          '--ignore_locks', '--output-json', gclient_output_file,
          '--nohooks', '--noprehooks', '--delete_unversioned_trees']
   if with_branch_heads:
-    cmd += ['--with_branch_heads']
+    args += ['--with_branch_heads']
   if shallow:
-    cmd += ['--shallow']
+    args += ['--shallow']
   if break_repo_locks:
-    cmd += ['--break_repo_locks']
+    args += ['--break_repo_locks']
 
   try:
-    call(*cmd, tries=1)
+    call_gclient(*args, tries=1)
   except SubprocessFailed as e:
     # Throw a GclientSyncFailed exception so we can catch this independently.
     raise GclientSyncFailed(e.message, e.code, e.output)
   else:
     with open(gclient_output_file) as f:
       return json.load(f)
   finally:
     os.remove(gclient_output_file)
 
 
 def gclient_revinfo():
-  gclient_bin = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
-  return call(gclient_bin, 'revinfo', '-a') or ''
+  return call_gclient('revinfo', '-a') or ''
 
 
 def create_manifest():
   manifest = {}
   output = gclient_revinfo()
   for line in output.strip().splitlines():
     match = REVINFO_RE.match(line.strip())
     if match:
       manifest[match.group(1)] = {
         'repository': match.group(2),
@@ skipping 762 matching lines @@
     # download patch failure is still an infra problem.
     if e.code == 3:
       # Patch download problem.
       return 87
     # Genuine patch problem.
     return 88
 
 
 if __name__ == '__main__':
   sys.exit(main())