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

Thomas Hood jdthood-guest at costa.debian.org
Wed Jan 11 16:03:25 UTC 2006


Author: jdthood-guest
Date: 2006-01-11 16:03:24 +0000 (Wed, 11 Jan 2006)
New Revision: 589

Modified:
   sysvinit/trunk/debian/initscripts/preinst
Log:
Tweak preinst

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2006-01-11 15:54:02 UTC (rev 588)
+++ sysvinit/trunk/debian/initscripts/preinst	2006-01-11 16:03:24 UTC (rev 589)
@@ -12,9 +12,8 @@
 # Adapted from code obtained from www.dpkg.org/ConffileHandling
 eliminate_conffile() {
 	CONFFILE="$1"
-
-	if [ -e "$CONFFILE" ]; then
-		CURRENT_MD5SUM="$(md5sum "$CONFFILE" | sed -e "s/ .*//")"
+	if [ -f "$CONFFILE" ]; then
+		CURRENT_MD5SUM="$(md5sum "$CONFFILE" 2>/dev/null | sed -e "s/ .*//")"
 		FACTORY_MD5SUM="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/.* //;p}}" /var/lib/dpkg/status)"
 		if [ "$CURRENT_MD5SUM" != "$FACTORY_MD5SUM" ]; then
 			echo -n "Renaming obsolete modified conffile "




More information about the Pkg-sysvinit-commits mailing list