[Pkg-sysvinit-commits] r1243 - in sysvinit/trunk/debian: . initscripts

[pere at alioth.debian.org]

Author: pere
Date: 2008-02-11 07:55:58 +0000 (Mon, 11 Feb 2008)
New Revision: 1243

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/preinst
Log:
  * Make sure to only check for conffile removal on upgrades.
  * Improve displayed text when removing unused obsolete conffiles.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-02-11 07:48:00 UTC (rev 1242)
+++ sysvinit/trunk/debian/changelog	2008-02-11 07:55:58 UTC (rev 1243)
@@ -1,6 +1,8 @@
 sysvinit (2.86.ds1-54) UNRELEASED; urgency=low
 
   * Fix shell quoting typo in conffile removal code (Closes: #464869).
+  * Make sure to only check for conffile removal on upgrades.
+  * Improve displayed text when removing unused obsolete conffiles.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 01 Feb 2008 19:37:42 +0100
 

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2008-02-11 07:48:00 UTC (rev 1242)
+++ sysvinit/trunk/debian/initscripts/preinst	2008-02-11 07:55:58 UTC (rev 1243)
@@ -22,7 +22,7 @@
 			echo "Saving as $CONFFILE.dpkg-old ..."
 			mv -f "$CONFFILE" "$CONFFILE".dpkg-old
 		else
-			echo "Removing obsolete conffile $CONFFILE ..."
+			echo "Removing unmodified and obsolete conffile $CONFFILE ..."
 			rm -f "$CONFFILE"
 		fi
 	fi
@@ -46,7 +46,7 @@
 	# The /etc/init.d/bootclean script fragment was moved to
 	# /lib/init/ in version 2.86.ds1-39
 	#
-	if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-39" ; then
+	if [ "$2" ] && dpkg --compare-versions "$2" lt "2.86.ds1-39" ; then
 		eliminate_conffile "/etc/init.d/bootclean"
 	fi
 	#