mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
Merge "repo: use explicit Python executable to run main.py"
This commit is contained in:
commit
53263d873d
4
repo
4
repo
@ -739,7 +739,7 @@ def main(orig_args):
|
|||||||
repo_main = my_main
|
repo_main = my_main
|
||||||
|
|
||||||
ver_str = '.'.join(map(str, VERSION))
|
ver_str = '.'.join(map(str, VERSION))
|
||||||
me = [repo_main,
|
me = [sys.executable, repo_main,
|
||||||
'--repo-dir=%s' % rel_repo_dir,
|
'--repo-dir=%s' % rel_repo_dir,
|
||||||
'--wrapper-version=%s' % ver_str,
|
'--wrapper-version=%s' % ver_str,
|
||||||
'--wrapper-path=%s' % wrapper_path,
|
'--wrapper-path=%s' % wrapper_path,
|
||||||
@ -747,7 +747,7 @@ def main(orig_args):
|
|||||||
me.extend(orig_args)
|
me.extend(orig_args)
|
||||||
me.extend(extra_args)
|
me.extend(extra_args)
|
||||||
try:
|
try:
|
||||||
os.execv(repo_main, me)
|
os.execv(sys.executable, me)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
_print("fatal: unable to start %s" % repo_main, file=sys.stderr)
|
_print("fatal: unable to start %s" % repo_main, file=sys.stderr)
|
||||||
_print("fatal: %s" % e, file=sys.stderr)
|
_print("fatal: %s" % e, file=sys.stderr)
|
||||||
|
Loading…
Reference in New Issue
Block a user