[Pkg-cups-devel] r146 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Wed Apr 12 12:30:25 2006
New Revision: 146

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.init.d
Log:
set TZ in init script only if TZ isn't defined yet. (suggestion from Thomas Hood)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Apr 12 12:30:25 2006
@@ -26,6 +26,7 @@
   * Update Danish debconf translation. (closes: #357969)
   * Use 'reload' during logrotate instead of 'restart'. It looks safe
     on CUPS 1.2. (though job-restart problem still remains)
+  * set TZ in init script only if TZ isn't defined yet.
 
   [ Martin Pitt ]
   * debian/patches/48_stdlib.dpatch: Adapted to new upstream version.

Modified: cupsys/branches/cups-1.2/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.init.d	Wed Apr 12 12:30:25 2006
@@ -13,7 +13,7 @@
 . /lib/lsb/init-functions
 
 # Get the timezone set.
-if [ -e /etc/timezone ]; then
+if [ -z "$TZ" -a -e /etc/timezone ]; then
     TZ=`cat /etc/timezone`
     export TZ
 fi