setlocalversion: fix i18n issue with svn

Closes #4700

Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 8f6870baa327ea248f9b9823ca1f1e69053f7ee9..19f6e7cd692301f3aee22eb6bc22578a8b5d1a0e 100644 (file)
--- 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 8d6fe909f980456adb5092f2a45cdaff6be0086b..a6edd7194cb6560239da3742a0f7d095e2d26ac4 100755 (executable)
--- 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