r2696 - tzdata/trunk/debian
Author: aurel32
Date: 2007-11-25 04:31:30 +0000 (Sun, 25 Nov 2007)
New Revision: 2696
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/config
Log:
* Remove leading/trailing slashes when reading the timezone.
closes: #452275.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2007-11-23 19:52:50 UTC (rev 2695)
+++ tzdata/trunk/debian/changelog 2007-11-25 04:31:30 UTC (rev 2696)
@@ -1,3 +1,10 @@
+tzdata (2007i-2) unstable; urgency=low
+
+ * Remove leading/trailing slashes when reading the timezone.
+ closes: #452275.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 25 Nov 2007 05:22:24 +0100
+
tzdata (2007i-1) unstable; urgency=low
* New upstream version.
Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config 2007-11-23 19:52:50 UTC (rev 2695)
+++ tzdata/trunk/debian/config 2007-11-25 04:31:30 UTC (rev 2696)
@@ -327,6 +327,8 @@
if [ -e /etc/timezone ]; then
TIMEZONE="$(head -n 1 /etc/timezone)"
TIMEZONE="${TIMEZONE%% *}"
+ TIMEZONE="${TIMEZONE##/}"
+ TIMEZONE="${TIMEZONE%%/}"
TIMEZONE="$(convert_timezone $TIMEZONE)"
if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then
AREA="${TIMEZONE%%/*}"
Reply to: