changeset 17706:70efdc22b188

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Oct 2012 16:44:28 +0200
parents 3d1a781b23c0 (current diff) 6929b9c70be9 (diff)
children 35674bd95200
files mercurial/subrepo.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Thu Oct 04 10:11:17 2012 +0200
+++ b/mercurial/subrepo.py	Thu Oct 04 16:44:28 2012 +0200
@@ -655,6 +655,10 @@
             cmd.append(path)
         env = dict(os.environ)
         # Avoid localized output, preserve current locale for everything else.
+        lc_all = env.get('LC_ALL')
+        if lc_all:
+            env['LANG'] = lc_all
+            del env['LC_ALL']
         env['LC_MESSAGES'] = 'C'
         p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE,