setup: set env global earlier (3073) stable
authorMatt Mackall <mpm@selenic.com>
Wed, 26 Oct 2011 12:56:27 -0500
branchstable
changeset 15367 b357a972d6cd
parent 15366 06b8db3f25c6
child 15369 b4ea79f88268
child 15394 84980b00fbcb
setup: set env global earlier (3073)
setup.py
--- a/setup.py	Tue Oct 25 08:56:59 2011 -0400
+++ b/setup.py	Wed Oct 26 12:56:27 2011 -0500
@@ -133,14 +133,14 @@
 
 version = ''
 
+env = {'HGRCPATH': '', 'LANGUAGE': 'C'}
+
 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),
-           'HGRCPATH': '',
-           'LANGUAGE': 'C'}
+    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: