Bug 1271884 - Use the current python executable to run tooltool fetch rather than hard-coded python. r?jmaher
MozReview-Commit-ID: NEtTg3tih8
--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -632,17 +632,18 @@ def _get_tooltool_manifest(substs, src_p
if not copied:
url = os.path.join(TRY_URL, src_path)
_download_file(url, filename, dst_path)
def _tooltool_fetch():
def outputHandler(line):
_log_debug(line)
_download_file(TOOLTOOL_URL, 'tooltool.py', EMULATOR_HOME_DIR)
- command = ['python', 'tooltool.py', 'fetch', '-o', '-m', 'releng.manifest']
+ command = [sys.executable, 'tooltool.py',
+ 'fetch', '-o', '-m', 'releng.manifest']
proc = ProcessHandler(
command, processOutputLine=outputHandler, storeOutput=False,
cwd=EMULATOR_HOME_DIR)
proc.run()
try:
proc.wait()
except:
if proc.poll() is None: