From: Joey Hess <joey@kitenet.net>
Date: Wed, 28 Nov 2007 20:46:45 +0000 (-0500)
Subject: * Use LC_MESSAGES=C not LANG=C, as if the user has LC_MESSAGES set, LANG
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/2ccc38f4061497e18172d3e9a470c3d489a0e23e?hp=f6212e16a60b0623d69bb0f1f6cb936d5c219da5

* Use LC_MESSAGES=C not LANG=C, as if the user has LC_MESSAGES set, LANG
  won't override it. Closes: #453305
---

diff --git a/debian/changelog b/debian/changelog
index efd897b..6ea3f1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.16) unstable; urgency=low
+
+  * Use LC_MESSAGES=C not LANG=C, as if the user has LC_MESSAGES set, LANG
+    won't override it. Closes: #453305
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 28 Nov 2007 15:46:38 -0500
+
 mr (0.15) unstable; urgency=low
 
   [ Joey Hess ]
diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 8afb84a..ac63404 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -48,7 +48,7 @@ git_fake_bare_diff = error "diff does not work for fake bare git repositories (y
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 
-	url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+	url="$(LC_MESSAGES=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
diff --git a/mr b/mr
index 8cfe013..db3abc5 100755
--- a/mr
+++ b/mr
@@ -1202,14 +1202,14 @@ darcs_log = darcs changes "$@"
 git_bare_log = git log "$@"
 
 svn_register =
-	url=`LANG=C svn info . | grep -i '^URL:' | cut -d ' ' -f 2`
+	url=`LC_MESSAGES=C svn info . | grep -i '^URL:' | cut -d ' ' -f 2`
 	if [ -z "$url" ]; then
 		error "cannot determine svn url"
 	fi
 	echo "Registering svn url: $url in $MR_CONFIG"
 	mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
-	url="`LANG=C git config --get remote.origin.url`" || true
+	url="`LC_MESSAGES=C git config --get remote.origin.url`" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
@@ -1239,7 +1239,7 @@ darcs_register =
 	echo "Registering darcs repository $url in $MR_CONFIG"
 	mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
-	url="`LANG=C GIT_CONFIG=config git config --get remote.origin.url`" || true
+	url="`LC_MESSAGES=C GIT_CONFIG=config git config --get remote.origin.url`" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
diff --git a/mrconfig.complex b/mrconfig.complex
index 8f86b70..d329cf3 100644
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -11,7 +11,7 @@ svn_cleanup = svn cleanup "$@"
 git_gc = git gc "$@"
 git_push = git push "$@"
 git_tag = git tag -l
-svn_tag = svn ls "$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
+svn_tag = svn ls "$(LC_MESSAGES=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
 # This hack is here because git-pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true