[Pkg-kbd-commit] r205 - people/zinoviev/console-setup/debian

[Anton Zinoviev]

Author: zinoviev
Date: 2006-09-15 19:03:03 +0000 (Fri, 15 Sep 2006)
New Revision: 205

Modified:
   people/zinoviev/console-setup/debian/changelog
   people/zinoviev/console-setup/debian/config.proto
Log:
console-setup.config: Handle C system locale with unavailable debian-installer/locale


Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2006-09-15 17:45:30 UTC (rev 204)
+++ people/zinoviev/console-setup/debian/changelog	2006-09-15 19:03:03 UTC (rev 205)
@@ -2,9 +2,12 @@
 
   * setupcon: new option --force to skip the 'are we on the console'
     check.  To be used for d-i because there /proc/self/fd/2 points to
-    pipe.  Thanks to Tollef Fog Heen from the Ubuntu team.
+    pipe.  Thanks to Tollef Fog Heen.
+  * console-setup.config: Handle C locale with debian-installer/locale not
+    being available.  Thanks to Colin Watson for the bug report and the
+    patch, closes: #386835.
 
- -- Anton Zinoviev <zinoviev at debian.org>  Sat, 22 Jul 2006 23:31:23 +0300
+ -- Anton Zinoviev <zinoviev at debian.org>  Fri, 15 Sep 2006 21:12:35 +0300
 
 console-setup (1.7) unstable; urgency=low
 

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2006-09-15 17:45:30 UTC (rev 204)
+++ people/zinoviev/console-setup/debian/config.proto	2006-09-15 19:03:03 UTC (rev 205)
@@ -233,9 +233,10 @@
 
 if [ "$LC_CTYPE"  -a "$LC_CTYPE" != C ]; then
     locale=$LC_CTYPE
+elif db_get debian-installer/locale && [ "$RET" ]; then
+    locale="$RET"
 else
-    db_get debian-installer/locale
-    locale="$RET"
+    locale=C
 fi
 
 case "$locale" in