Honor the --boto flag.

depot_tools/download_from_google_storage.py

Index: depot_tools/download_from_google_storage.py
===================================================================
--- depot_tools/download_from_google_storage.py	(revision 207257)
+++ depot_tools/download_from_google_storage.py	(working copy)
@@ -35,7 +35,7 @@
 class Gsutil(object):
   """Call gsutil with some predefined settings.  This is a convenience object,
   and is also immutable."""
-  def __init__(self, path, boto_path=None, timeout=None):
+  def __init__(self, path, boto_path, timeout=None):

[Ryan Tseng, 2013/06/19 21:47:30]

Two of the tests in tests/download_from_google_storage_unittests.py fail due to
the changed method signature.  Can you fix the tests?

[Peter Mayo, 2013/06/19 23:52:17]

Done.

  $ ./tests/download_from_google_storage_unittests.py |& grep OK
  OK


Would have helped if the presubmit didn't depend on bizarre extra pieces.

** Presubmit ERRORS **
Missing LGTM from someone other than petermayo@chromium.org

Install google_appengine sdk in
/usr/local/google/home/petermayo/clients/tools2/tools/depot_tools/testing_support
or higher up

Presubmit checks took 45.3s to calculate.

     if not os.path.exists(path):
       raise FileNotFoundError('GSUtil not found in %s' % path)
     self.path = path
@@ -313,12 +313,12 @@
 
   # Make sure we can find a working instance of gsutil.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
-    gsutil = Gsutil(GSUTIL_DEFAULT_PATH)
+    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
   else:
     gsutil = None
     for path in os.environ["PATH"].split(os.pathsep):
       if os.path.exists(path) and 'gsutil' in os.listdir(path):
-        gsutil = Gsutil(os.path.join(path, 'gsutil'))
+        gsutil = Gsutil(os.path.join(path, 'gsutil'), boto_path=options.boto)
     if not gsutil:
       parser.error('gsutil not found in %s, bad depot_tools checkout?' %
                    GSUTIL_DEFAULT_PATH)
@@ -335,4 +335,4 @@
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  sys.exit(main(sys.argv))