r4756 - tzdata/trunk/debian
Author: aurel32
Date: 2011-06-28 05:36:09 +0000 (Tue, 28 Jun 2011)
New Revision: 4756
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/config
Log:
* Ignore debconf errors, return default values in that case.
Closes: #631878.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2011-06-27 21:01:35 UTC (rev 4755)
+++ tzdata/trunk/debian/changelog 2011-06-28 05:36:09 UTC (rev 4756)
@@ -1,3 +1,10 @@
+tzdata (2011h-2) unstable; urgency=low
+
+ * Ignore debconf errors, return default values in that case.
+ Closes: #631878.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 28 Jun 2011 07:23:04 +0200
+
tzdata (2011h-1) unstable; urgency=low
[ Aurelien Jarno ]
Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config 2011-06-27 21:01:35 UTC (rev 4755)
+++ tzdata/trunk/debian/config 2011-06-28 05:36:09 UTC (rev 4756)
@@ -357,10 +357,10 @@
# The timezone has never been configured or is falsely configured
elif ! [ -e /etc/localtime ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
if [ -z "$AREA" ] || [ -z "$ZONE" ] ; then
- AREA="Etc"
- ZONE="UTC"
- db_get tzdata/Areas && AREA="$RET"
- db_get tzdata/Zones/$AREA && ZONE="$RET"
+ db_get tzdata/Areas || RET="Etc"
+ AREA=$RET
+ db_get tzdata/Zones/$AREA || RET="UTC"
+ ZONE=$RET
echo "$AREA/$ZONE" > /etc/timezone
fi
db_fset tzdata/Areas seen false
Reply to: