[Pkg-sysvinit-commits] r588 - sysvinit/trunk/debian/initscripts

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-11 15:54:02 +0000 (Wed, 11 Jan 2006)
New Revision: 588

Modified:
   sysvinit/trunk/debian/initscripts/preinst
Log:
Improve messages from preinst

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2006-01-11 15:42:46 UTC (rev 587)
+++ sysvinit/trunk/debian/initscripts/preinst	2006-01-11 15:54:02 UTC (rev 588)
@@ -10,18 +10,18 @@
 #
 # If the argument was not listed as a conffile, silently do nothing.
 # Adapted from code obtained from www.dpkg.org/ConffileHandling
-rm_conffile() {
+eliminate_conffile() {
 	CONFFILE="$1"
 
 	if [ -e "$CONFFILE" ]; then
 		CURRENT_MD5SUM="$(md5sum "$CONFFILE" | sed -e "s/ .*//")"
 		FACTORY_MD5SUM="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/.* //;p}}" /var/lib/dpkg/status)"
 		if [ "$CURRENT_MD5SUM" != "$FACTORY_MD5SUM" ]; then
-			echo "Renaming obsolete modified conffile to '${CONFFILE}.dpkg-old'."
-			mv -f "$CONFFILE" "$CONFFILE".dpkg-old
+			echo -n "Renaming obsolete modified conffile "
+			mv -vf "$CONFFILE" "$CONFFILE".dpkg-old
 		else
-			echo "Removing obsolete unmodified conffile ${CONFFILE}."
-			rm -f "$CONFFILE"
+			echo -n "Unmodified conffile '${CONFFILE}' is obsolete; "
+			rm -vf "$CONFFILE"
 		fi
 	fi
 }
@@ -37,8 +37,8 @@
 	#
 	# Remove obsolete conffiles
 	#
-	if dpkg --compare-versions "$2" le "2.86.ds1-9" ; then
-		rm_conffile "/etc/init.d/bootclean.sh"
+	if [ "$2" ] && dpkg --compare-versions "$2" lt "2.86.ds1-10" ; then
+		eliminate_conffile "/etc/init.d/bootclean.sh"
 	fi
 	;;
   abort-upgrade)