SOURCES: timezone.sysconfig, timezone.init - merged ZONE_INFO_AREA...

[megabajt]

Author: megabajt                     Date: Thu Apr 24 13:30:07 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged ZONE_INFO_AREA and TIME_ZONE into TIMEZONE

---- Files affected:
SOURCES:
   timezone.sysconfig (1.2 -> 1.3) , timezone.init (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/timezone.sysconfig
diff -u SOURCES/timezone.sysconfig:1.2 SOURCES/timezone.sysconfig:1.3
--- SOURCES/timezone.sysconfig:1.2	Sun Feb 25 01:46:32 2007
+++ SOURCES/timezone.sysconfig	Thu Apr 24 15:30:02 2008
@@ -6,8 +6,5 @@
 # Scheme you would like to use in your system.
 ZONE_INFO_SCHEME="posix"
 
-# Area (sometimes may be empty)
-ZONE_INFO_AREA="Europe"
-
 # Name of the time zone for your system.
-TIME_ZONE="Warsaw"
+TIMEZONE="Europe/Warsaw"

================================================================
Index: SOURCES/timezone.init
diff -u SOURCES/timezone.init:1.12 SOURCES/timezone.init:1.13
--- SOURCES/timezone.init:1.12	Tue Mar  4 21:37:29 2008
+++ SOURCES/timezone.init	Thu Apr 24 15:30:02 2008
@@ -20,11 +20,7 @@
 	ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
 fi
 
-if [ -n "$ZONE_INFO_AREA" ]; then
-	ZONE_FILE="$ZONE_FILE/$ZONE_INFO_AREA"
-fi
-
-ZONE_FILE="$ZONE_FILE/$TIME_ZONE"
+ZONE_FILE="$ZONE_FILE/$TIMEZONE"
 
 [ -L /etc/localtime ] && [ "$(resolvesymlink /etc/localtime)" = "$ZONE_FILE" ] && exit 0
 
@@ -33,11 +29,8 @@
 		if [ -f "$ZONE_FILE" ]; then
 			rm -f /etc/localtime
 
-			if [ -n "$ZONE_INFO_AREA" ]; then
-				MESSAGE="`nls 'Setting time zone information (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"`"
-			else
-				MESSAGE="`nls 'Setting time zone information (%s)' "$TIME_ZONE"`"
-			fi
+			MESSAGE="`nls 'Setting time zone information (%s)' "$TIMEZONE"`"
+
 			run_cmd "$MESSAGE" cp -af $ZONE_FILE /etc/localtime
 			RETVAL=$?
 			restorecon /etc/localtime >/dev/null 2>&1
@@ -74,11 +67,7 @@
 	disable
 	;;
   status)
-	if [ -n "$ZONE_INFO_AREA" ]; then
-		nls 'Time zone configured to (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"
-	else
-		nls 'Time zone configured to (%s)' "$TIME_ZONE"
-	fi
+	nls 'Time zone configured to (%s)' "$TIMEZONE"
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|disable|status}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/timezone.sysconfig?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/timezone.init?r1=1.12&r2=1.13&f=u