Fix error where we are looking the gsutil script in the wrong location.

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 202 matching lines @@
   USE_DART_REPO_VERSION = False
 
   def _layzCalculateGSUtilPath(self):
     if not GSUtil.GSUTIL_PATH:
       buildbot_gsutil = utils.GetBuildbotGSUtilPath()
       if os.path.isfile(buildbot_gsutil) and not GSUtil.USE_DART_REPO_VERSION:
         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
+        if os.path.isfile(dart_gsutil):
+          GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
+          GSUtil.GSUTIL_PATH = dart_gsutil
+        elif GSUtil.USE_DART_REPO_VERSION:
+          raise Exception("Requiring to use dart repo version of gsutil,"

[Bill Hesse, 2014/03/07 12:19:53]

Dart repository version of gsutil required, but not found.

[ricow1, 2014/03/07 12:30:15]

Done.

+                          " but not found.")
+        else:
+          # We did not find gsutil, look in path
+          possible_locations = list(os.environ['PATH'].split(os.pathsep))
+          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',
@@ skipping 57 matching lines @@
   if not mangled_filename:
     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