Bug 1271884 - Use the current python executable to run tooltool fetch rather than hard-coded python. r?jmaher draft
authorXidorn Quan <me@upsuper.org>
Wed, 11 May 2016 15:01:16 +1000
changeset 365586 60a1f429f232ef4ad01dbc7b1f99e995e55f3d5c
parent 365579 77a9e19f84acd5798d45a83f72e1c52587e6fc1c
child 520606 491b959e7cdbafdad0aefc0f932d6e78f7be12ae
push id17796
push userxquan@mozilla.com
push dateWed, 11 May 2016 05:01:36 +0000
reviewersjmaher
bugs1271884
milestone49.0a1
Bug 1271884 - Use the current python executable to run tooltool fetch rather than hard-coded python. r?jmaher MozReview-Commit-ID: NEtTg3tih8
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
--- 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: