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

tools/bots/bot_utils.py

Index: tools/bots/bot_utils.py
===================================================================
--- tools/bots/bot_utils.py	(revision 33421)
+++ tools/bots/bot_utils.py	(working copy)
@@ -220,14 +220,21 @@
         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):