merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Oct 2012 16:44:28 +0200
changeset 17706 70efdc22b188
parent 17704 3d1a781b23c0 (current diff)
parent 17705 6929b9c70be9 (diff)
child 17707 35674bd95200
merge with crew-stable
mercurial/subrepo.py
--- 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,