Use shell script on buildbot to call gsutil otherwise the python script

dart/tools/bots/bot_utils.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import hashlib
 import imp
 import os
 import subprocess
@@ skipping 126 matching lines @@
                        stderr=subprocess.PIPE, env=env)
   (stdout, stderr) = p.communicate()
   if p.returncode != 0:
     print >> sys.stderr, "Failed to execute '%s'. Exit code: %s." % (
         command, p.returncode)
     print >> sys.stderr, "stdout: ", stdout
     print >> sys.stderr, "stderr: ", stderr
     raise Exception("Failed to execute %s." % command)
 
 class GSUtil(object):
+  GSUTIL_IS_SHELL_SCRIPT = False
   GSUTIL_PATH = None
-  
+
   def _layzCalculateGSUtilPath(self):
     if not GSUtil.GSUTIL_PATH:
-      dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil', 'gsutil')
       buildbot_gsutil = os.path.dirname(utils.GetBuildbotGSUtilPath())
-      possible_locations = (list(os.environ['PATH'].split(os.pathsep))
-          + [dart_gsutil, buildbot_gsutil])
-      for directory in possible_locations:
-        location = os.path.join(directory, 'gsutil')
-        if os.path.isfile(location):
-          GSUtil.GSUTIL_PATH = location
-          break
+      if os.path.isfile(buildbot_gsutil):
+        GSUtil.GSUTIL_IS_SHELL_SCRIPT = True
+        GSUtil.GSUTIL_PATH = buildbot_gsutil
+      else:
+        dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil', 'gsutil')
+        possible_locations = (list(os.environ['PATH'].split(os.pathsep))
+            + [dart_gsutil])
+        for directory in possible_locations:
+          location = os.path.join(directory, 'gsutil')
+          if os.path.isfile(location):
+            GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
+            GSUtil.GSUTIL_PATH = location
+            break
       assert GSUtil.GSUTIL_PATH
 
   def execute(self, gsutil_args):
     self._layzCalculateGSUtilPath()
 
     env = dict(os.environ)
     # If we're on the buildbot, we use a specific boto file.
     if utils.GetUserName() == 'chrome-bot':
       boto_config = {
         'linux': '/mnt/data/b/build/site_config/.boto',
         'macos': '/Volumes/data/b/build/site_config/.boto',
         'win32': r'e:\b\build\site_config\.boto',
       }[utils.GuessOS()]
       env['AWS_CREDENTIAL_FILE'] = boto_config
       env['BOTO_CONFIG'] = boto_config
-    run([sys.executable, GSUtil.GSUTIL_PATH] + gsutil_args,
-        env=env)
+
+    if GSUtil.GSUTIL_IS_SHELL_SCRIPT:
+      gsutil_command = [GSUtil.GSUTIL_PATH]
+    else:
+      gsutil_command = [sys.executable, GSUtil.GSUTIL_PATH]
+
+    run(gsutil_command + gsutil_args, env=env)
 
   def upload(self, local_path, remote_path, recursive=False, public=False):
     assert remote_path.startswith('gs://')
 
     args = ['cp']
     if public:
       args += ['-a', 'public-read']
     if recursive:
       args += ['-R']
     args += [local_path, remote_path]
@@ skipping 27 matching lines @@
     mangled_filename = os.path.basename(filename)
 
   checksum = CalculateChecksum(filename)
   checksum_filename = '%s.md5sum' % filename
 
   with open(checksum_filename, 'w') as f:
     f.write('%s *%s' % (checksum, mangled_filename))
 
   return checksum_filename