0

[telemetry] Don't prepend python when running gsutil on POSIX.

We have a bot that's using a shell script as a symlink. So Telemetry should just run it as an executable, not as a Python script.

BUG=None.
TEST=None.

Review URL: https://codereview.chromium.org/1150723006

Cr-Commit-Position: refs/heads/master@{#332251}
This commit is contained in:
dtu
2015-06-01 12:59:13 -07:00
committed by Commit bot
parent 9da3d61aaa
commit 3070a949bf

@ -135,9 +135,15 @@ def _RunCommand(args):
gsutil_env = os.environ.copy()
gsutil_env['HOME'] = _CROS_GSUTIL_HOME_WAR
gsutil = subprocess.Popen([sys.executable, gsutil_path] + args,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=gsutil_env)
if os.name == 'nt':
# If Windows, prepend python. Python scripts aren't directly executable.
args = [sys.executable, gsutil_path] + args
else:
# Don't do it on POSIX, in case someone is using a shell script to redirect.
args = [gsutil_path] + args
gsutil = subprocess.Popen(args, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=gsutil_env)
stdout, stderr = gsutil.communicate()
if gsutil.returncode: