r7415 - in /vdr/vdradmin-am/trunk/debian: changelog vdradmin-am.init

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Fri Oct 17 11:37:30 2008
New Revision: 7415

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7415
Log:
Now taking /etc/default/locale into account, when setting the locale for the
vdradmin-am daemon (still falling back to /etc/environment for backwards
compatibility) (Closes: #502116)

Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/vdradmin-am.init

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=7415&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Fri Oct 17 11:37:30 2008
@@ -1,3 +1,11 @@
+vdradmin-am (3.6.2-2) unstable; urgency=low
+
+  * Now taking /etc/default/locale into account, when setting the locale for the
+    vdradmin-am daemon (still falling back to /etc/environment for backwards
+    compatibility) (Closes: #502116)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 17 Oct 2008 13:30:08 +0200
+
 vdradmin-am (3.6.2-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.init?rev=7415&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init Fri Oct 17 11:37:30 2008
@@ -49,14 +49,19 @@
     fi
 }
 
+# configure locale which is used for running vdradmin-am from
+# /etc/default/locale or /etc/environment
 init_language_environment()
 {
-    if [ -f /etc/environment ]
-    then
-         for var in LANG LC_ALL LC_CTYPE ; do
-	     value=$(egrep "^[^#]*${var}=" /etc/environment | tail -n1 | cut -d= -f2)
-	     eval $var=$value
-	 done
+    ENV_FILE="none"
+    [ -r /etc/environment ] && ENV_FILE="/etc/environment"
+    [ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
+    echo $ENV_FILE
+    if  [ ! $ENV_FILE = none ] ; then
+        for var in LANG LC_ALL LC_CTYPE ; do
+            value=$(egrep "^[^#]*${var}=" $ENV_FILE | tail -n1 | cut -d= -f2)
+            eval $var=$value
+        done
     fi
 }