From 44d92ec449e7397bdefa49eb901e4bb89eafaa70 Mon Sep 17 00:00:00 2001 From: David Cournapeau Date: Mon, 1 Jun 2009 05:43:16 +0000 Subject: BUG #1100: fix svn version detection for localized environments. --- setup.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0e9229ccd..53affe94d 100755 --- a/setup.py +++ b/setup.py @@ -56,10 +56,23 @@ VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) # Return the svn version as a string, raise a ValueError otherwise def svn_version(): + def _minimal_ext_cmd(cmd): + # construct minimal environment + env = {} + path = os.environ.get('PATH') + if path is not None: + env['PATH'] = path + # LANGUAGE is used on win32 + env['LANGUAGE'] = 'C' + env['LANG'] = 'C' + env['LC_ALL'] = 'C' + out = subprocess.Popen(cmd, stdout = subprocess.PIPE, env=env).communicate()[0] + return out + try: - out = subprocess.Popen(['svn', 'info'], stdout = subprocess.PIPE).communicate()[0] + out = _minimal_ext_cmd(['svn', 'info']) except OSError: - print " --- Could not run svn info --- " + print(" --- Could not run svn info --- ") return "" r = re.compile('Revision: ([0-9]+)') -- cgit v1.2.1