aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbertxue <herbertxue@google.com>2020-02-15 13:22:55 +0000
committerherbertxue <herbertxue@google.com>2020-02-15 13:22:55 +0000
commitda255a0424f1fa00d15a83fe8304db1a57f8170c (patch)
treea05eacb7fd58cd91ab3931d5911462106c81671f
parentdcdc92291e608867c800328c6cb6d453e8ca2472 (diff)
parent3b2135f458746ec704df0101c1a8bc2be23a4c45 (diff)
downloadacloud-da255a0424f1fa00d15a83fe8304db1a57f8170c.tar.gz
Fix 'repo info' error in python2 during acloud creation. am: 9a4962774d am: 38de75c8de am: 3b2135f458
Change-Id: I9e4f6d8616e02115ba47373a2d6b075036ea3633
-rw-r--r--create/avd_spec.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/create/avd_spec.py b/create/avd_spec.py
index fed31a5a..85da3d94 100644
--- a/create/avd_spec.py
+++ b/create/avd_spec.py
@@ -577,7 +577,11 @@ class AVDSpec(object):
"""
repo_output = ""
try:
- repo_output = subprocess.check_output(_COMMAND_REPO_INFO)
+ # TODO(149460014): Migrate acloud to py3, then remove this
+ # workaround.
+ env = os.environ.copy()
+ env.pop("PYTHONPATH", None)
+ repo_output = subprocess.check_output(_COMMAND_REPO_INFO, env=env)
except subprocess.CalledProcessError:
utils.PrintColorString(
"Unable to determine your repo branch, defaulting to %s"