[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2179 - tzdata/trunk/debian



Author: aurel32
Date: 2007-05-05 13:02:24 +0000 (Sat, 05 May 2007)
New Revision: 2179

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/postinst
Log:
  * debian/postinst: print the current local and UTC times even when using
    user defined /etc/localtime.



Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2007-05-05 12:53:30 UTC (rev 2178)
+++ tzdata/trunk/debian/changelog	2007-05-05 13:02:24 UTC (rev 2179)
@@ -8,6 +8,8 @@
     bug#422186).
   * debian/config: verify that /etc/localtime symlink points to a file
     in /usr/share/zoneinfo (closes: bug#421280).
+  * debian/postinst: print the current local and UTC times even when using
+    user defined /etc/localtime.
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 05 May 2007 05:52:04 -0700
 

Modified: tzdata/trunk/debian/postinst
===================================================================
--- tzdata/trunk/debian/postinst	2007-05-05 12:53:30 UTC (rev 2178)
+++ tzdata/trunk/debian/postinst	2007-05-05 13:02:24 UTC (rev 2179)
@@ -3,6 +3,7 @@
 
 LC_ALL=C
 LANG=C
+unset TZ
 umask 022
 
 . /usr/share/debconf/confmodule
@@ -14,8 +15,6 @@
         db_stop
         echo
         echo "User defined timezone, leaving /etc/localtime unchanged."
-        echo "Run 'dpkg-reconfigure tzdata' if you wish to change it."
-	echo
     else
     
         # Get the values from debconf
@@ -30,17 +29,18 @@
         rm -f /etc/localtime && \
             cp -f /usr/share/zoneinfo/$AREA/$ZONE /etc/localtime
     
-        # Show the new setting to the user
-        TZBase=$(LC_ALL=C TZ=UTC0 date)
-        UTdate=$(TZ=UTC0 date -d "$TZBase")
-        TZdate=$(TZ="$AREA/$ZONE" date -d "$TZBase")
         echo 
         echo "Current default timezone: '$AREA/$ZONE'"
-        echo "Local time is now:      $TZdate."
-        echo "Universal Time is now:  $UTdate."
-        echo "Run 'dpkg-reconfigure tzdata' if you wish to change it."
-        echo
     fi
+
+    # Show the new setting to the user
+    TZBase=$(TZ=UTC0 date)
+    UTdate=$(TZ=UTC0 date -d "$TZBase")
+    TZdate=$(date -d "$TZBase")
+    echo "Local time is now:      $TZdate."
+    echo "Universal Time is now:  $UTdate."
+    echo "Run 'dpkg-reconfigure tzdata' if you wish to change it."
+    echo
 fi
 
 #DEBHELPER#



Reply to: