diff options
| author | Conley Owens <cco3@android.com> | 2013-10-10 18:42:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-10 18:42:59 +0000 |
| commit | 53263d873d16220d3b77302dc98cc35c4a5558ef (patch) | |
| tree | 7391f540301bdc112ae88f04cfe49a3f378f274d | |
| parent | b25ea555c39cd500740acb74fa9f1dab71588266 (diff) | |
| parent | 3a2a59eb87b58a4b5a26349434db322846cb6b57 (diff) | |
| download | git-repo-53263d873d16220d3b77302dc98cc35c4a5558ef.tar.gz | |
Merge "repo: use explicit Python executable to run main.py"
| -rwxr-xr-x | repo | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -739,7 +739,7 @@ def main(orig_args): | |||
| 739 | repo_main = my_main | 739 | repo_main = my_main |
| 740 | 740 | ||
| 741 | ver_str = '.'.join(map(str, VERSION)) | 741 | ver_str = '.'.join(map(str, VERSION)) |
| 742 | me = [repo_main, | 742 | me = [sys.executable, repo_main, |
| 743 | '--repo-dir=%s' % rel_repo_dir, | 743 | '--repo-dir=%s' % rel_repo_dir, |
| 744 | '--wrapper-version=%s' % ver_str, | 744 | '--wrapper-version=%s' % ver_str, |
| 745 | '--wrapper-path=%s' % wrapper_path, | 745 | '--wrapper-path=%s' % wrapper_path, |
| @@ -747,7 +747,7 @@ def main(orig_args): | |||
| 747 | me.extend(orig_args) | 747 | me.extend(orig_args) |
| 748 | me.extend(extra_args) | 748 | me.extend(extra_args) |
| 749 | try: | 749 | try: |
| 750 | os.execv(repo_main, me) | 750 | os.execv(sys.executable, me) |
| 751 | except OSError as e: | 751 | except OSError as e: |
| 752 | _print("fatal: unable to start %s" % repo_main, file=sys.stderr) | 752 | _print("fatal: unable to start %s" % repo_main, file=sys.stderr) |
| 753 | _print("fatal: %s" % e, file=sys.stderr) | 753 | _print("fatal: %s" % e, file=sys.stderr) |