[debian-edu-commits] r81485 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-09 09:13:15 +0000 (Tue, 09 Jul 2013)
New Revision: 81485

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/locale
Log:
Adjust locale check in test suite to the fact that locale is no
longer set in /etc/environment.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-09 08:03:19 UTC (rev 81484)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-09 09:13:15 UTC (rev 81485)
@@ -1,3 +1,11 @@
+debian-edu-config (1.709~svn81468) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Adjust locale check in test suite to the fact that locale is no
+    longer set in /etc/environment.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 09 Jul 2013 11:12:46 +0200
+
 debian-edu-config (1.709~svn81467) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/testsuite/locale
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/locale	2013-07-09 08:03:19 UTC (rev 81484)
+++ branches/wheezy/debian-edu-config/testsuite/locale	2013-07-09 09:13:15 UTC (rev 81485)
@@ -1,21 +1,12 @@
 #!/bin/sh -e
 #
-# Test if the locale is correctly configured.
+# Check the current locale settings
 
 echo "info: $0: install locale: '$LANG' '$LANGUAGE'"
 
 env|egrep 'LC|LANG' | sed "s%^%info: $0: install env: %"
 
-if [ ! -f /etc/environment ] ; then
-    echo "error: $0: Unable to find /etc/environment."
-    exit 1
-else
-    unset LANG LANGUAGE LC_ALL
-    set -a
-    . /etc/environment
-    locale | sed "s%^%info: $0: locale: %"
-    locale charmap | sed "s%^%info: $0: locale charmap: %"
-    env|egrep 'LC|LANG' | sed "s%^%info: $0: env: %"
-fi
+locale | sed "s%^%info: $0: locale: %"
+locale charmap | sed "s%^%info: $0: locale charmap: %"
 
 exit 0