summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Pasch <fpasch@googlemail.com>2012-01-16 13:54:57 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2012-01-16 13:54:57 +0100
commit4861aed1f1fccd20bf092127b255562eaaf183c1 (patch)
tree6c8d197fba1a42d63be68b4a782d32aaed4f8681
parent8c7c0ab34469ac7bfe1f5ccb9fc3c74c9ef0b4c7 (diff)
setlocalversion: fix i18n issue with svn
Closes #4700 Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rwxr-xr-xsupport/scripts/setlocalversion4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 8f6870baa..19f6e7cd6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@
#3403: libgpg-error: bump to version 1.10
#3409: libgpg-error: download from gnupg.org
#3421: nano: make tiny flag optional
+ #4700: setlocalversion not working for combination svn/ubuntu 11.10...
2011.11, Released November 30th, 2011:
diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion
index 8d6fe909f..a6edd7194 100755
--- a/support/scripts/setlocalversion
+++ b/support/scripts/setlocalversion
@@ -56,9 +56,9 @@ if hgid=`hg id 2>/dev/null`; then
fi
# Check for svn and a svn repo.
-if rev=`LANG=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
+if rev=`LC_ALL=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
rev=`echo $rev | awk '{print $NF}'`
- changes=`LANG=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
+ changes=`LC_ALL=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
# Are there uncommitted changes?
if [ $changes != 0 ]; then