[debian-edu-commits] r82663 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-11-21 20:54:15 +0000 (Thu, 21 Nov 2013)
New Revision: 82663

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Make debian-edu-bless abort if the current locale is not working,
instead of asking ldap and autofs to use a bogus LDAP server.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-11-21 20:53:09 UTC (rev 82662)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-11-21 20:54:15 UTC (rev 82663)
@@ -8,6 +8,8 @@
   * Make debian-edu-bless more robust on flaky networks, by trying
     several times to download packages while installing.
   * Document in debian-edu-bless that xfce is a desktop option.
+  * Make debian-edu-bless abort if the current locale is not working,
+    instead of asking ldap and autofs to use a bogus LDAP server.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 18 Sep 2013 14:35:10 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-11-21 20:53:09 UTC (rev 82662)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-11-21 20:54:15 UTC (rev 82663)
@@ -18,6 +18,14 @@
 set -e
 set -x
 
+# Abort if the current locale isn't working, the perl warning do not
+# show up in /etc/ldap/ldap.conf and similar.
+# An alternative is to set 'PERL_BADLANG=0' to quiet down perl.
+if perl -e 'print' 2>&1 |grep -q 'locale failed' ; then
+    echo "The current locale is invalid.  Please fix before running debian-edu-bless again."
+    exit 1
+fi
+
 # Set up this (or these) profile(s)
 # Possible values, can be combined using comma
 #   Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server,