Mercurial > hg
changeset 15388:eb6c0d47c3d5 stable
setup: set whole env for running hg even if .hg doesn't exist (issue3073)
The issue was partially fixed by b357a972d6cd, but there were missing
variables to run build_hgextindex.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Mon, 31 Oct 2011 00:42:32 +0900 |
| parents | 87248de09135 |
| children | 3bece03bf3c6 |
| files | setup.py |
| diffstat | 1 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Sun Oct 30 12:10:11 2011 -0500 +++ b/setup.py Mon Oct 31 00:42:32 2011 +0900 @@ -133,21 +133,22 @@ version = '' -env = {'HGRCPATH': '', 'LANGUAGE': 'C'} +# Execute hg out of this directory with a custom environment which +# includes the pure Python modules in mercurial/pure. We also take +# care to not use any hgrc files and do no localization. +pypath = ['mercurial', os.path.join('mercurial', 'pure')] +env = {'PYTHONPATH': os.pathsep.join(pypath), + 'HGRCPATH': '', + 'LANGUAGE': 'C'} +if 'LD_LIBRARY_PATH' in os.environ: + env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] +if 'SystemRoot' in os.environ: + # Copy SystemRoot into the custom environment for Python 2.6 + # under Windows. Otherwise, the subprocess will fail with + # error 0xc0150004. See: http://bugs.python.org/issue3440 + env['SystemRoot'] = os.environ['SystemRoot'] if os.path.isdir('.hg'): - # Execute hg out of this directory with a custom environment which - # includes the pure Python modules in mercurial/pure. We also take - # care to not use any hgrc files and do no localization. - pypath = ['mercurial', os.path.join('mercurial', 'pure')] - env['PYTHONPATH'] = os.pathsep.join(pypath) - if 'LD_LIBRARY_PATH' in os.environ: - env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] - if 'SystemRoot' in os.environ: - # Copy SystemRoot into the custom environment for Python 2.6 - # under Windows. Otherwise, the subprocess will fail with - # error 0xc0150004. See: http://bugs.python.org/issue3440 - env['SystemRoot'] = os.environ['SystemRoot'] cmd = [sys.executable, 'hg', 'id', '-i', '-t'] l = runhg(cmd, env).split() while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags