|
|
@ -221,12 +221,12 @@ def main(args):
|
|
|
|
|
|
|
|
|
|
|
|
# Make sure we can find a working instance of gsutil.
|
|
|
|
# Make sure we can find a working instance of gsutil.
|
|
|
|
if os.path.exists(GSUTIL_DEFAULT_PATH):
|
|
|
|
if os.path.exists(GSUTIL_DEFAULT_PATH):
|
|
|
|
gsutil = Gsutil(GSUTIL_DEFAULT_PATH)
|
|
|
|
gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
gsutil = None
|
|
|
|
gsutil = None
|
|
|
|
for path in os.environ["PATH"].split(os.pathsep):
|
|
|
|
for path in os.environ["PATH"].split(os.pathsep):
|
|
|
|
if os.path.exists(path) and 'gsutil' in os.listdir(path):
|
|
|
|
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:
|
|
|
|
if not gsutil:
|
|
|
|
parser.error('gsutil not found in %s, bad depot_tools checkout?' %
|
|
|
|
parser.error('gsutil not found in %s, bad depot_tools checkout?' %
|
|
|
|
GSUTIL_DEFAULT_PATH)
|
|
|
|
GSUTIL_DEFAULT_PATH)
|
|
|
@ -242,4 +242,4 @@ def main(args):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
if __name__ == '__main__':
|
|
|
|
sys.exit(main(sys.argv))
|
|
|
|
sys.exit(main(sys.argv))
|
|
|
|