r4790 - tzdata/trunk/debian

[Aurelien Jarno <aurel32@alioth.debian.org>]

Author: aurel32
Date: 2011-07-04 17:54:43 +0000 (Mon, 04 Jul 2011)
New Revision: 4790

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/config
Log:
  * Correctly handle empty debconf values (how is that possible for a 
    select entry?).  Closes: #545146, #631878.



Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2011-07-04 05:29:53 UTC (rev 4789)
+++ tzdata/trunk/debian/changelog	2011-07-04 17:54:43 UTC (rev 4790)
@@ -1,3 +1,10 @@
+tzdata (2011h-3) unstable; urgency=low
+
+  * Correctly handle empty debconf values (how is that possible for a 
+    select entry?).  Closes: #545146, #631878.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 04 Jul 2011 19:53:21 +0200
+
 tzdata (2011h-2) unstable; urgency=low
 
   * Ignore debconf errors, return default values in that case. 

Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config	2011-07-04 05:29:53 UTC (rev 4789)
+++ tzdata/trunk/debian/config	2011-07-04 17:54:43 UTC (rev 4790)
@@ -357,10 +357,22 @@
 # The timezone has never been configured or is falsely configured
 elif ! [ -e /etc/localtime ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
     if [ -z "$AREA" ] || [ -z "$ZONE" ] ; then
-        db_get tzdata/Areas || RET="Etc"
-        AREA=$RET
-        db_get tzdata/Zones/$AREA || RET="UTC"
-        ZONE=$RET
+        RET=""
+        db_get tzdata/Areas || true
+        if [ -n "$RET" ] ; then
+            AREA=$RET
+        else
+            AREA="Etc"
+        fi
+
+        RET=""
+        db_get tzdata/Zones/$AREA || RET=true
+        if [ -n "$RET" ] ; then
+            ZONE=$RET
+        else
+            ZONE="UTC"
+        fi
+
         echo "$AREA/$ZONE" > /etc/timezone
     fi
     db_fset tzdata/Areas seen false