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

[pere at alioth.debian.org]

Author: pere
Date: 2008-05-29 17:47:53 +0000 (Thu, 29 May 2008)
New Revision: 1281

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/preinst
Log:
  * Repair eliminate_conffile() in initscripts preinst, making sure
    unchanged conffiles are properly handled (Closes: #483391).
    Patch from Martin Pitt and Ubuntu.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-05-29 17:43:25 UTC (rev 1280)
+++ sysvinit/trunk/debian/changelog	2008-05-29 17:47:53 UTC (rev 1281)
@@ -2,6 +2,9 @@
 
   * Optimize start symlinks as if they are stop symlinks for runlevels 0 and
     6, to avoid problems with portmap during shutdown (Closes: #483172).
+  * Repair eliminate_conffile() in initscripts preinst, making sure
+    unchanged conffiles are properly handled (Closes: #483391).
+    Patch from Martin Pitt and Ubuntu.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 29 May 2008 19:42:06 +0200
 

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2008-05-29 17:43:25 UTC (rev 1280)
+++ sysvinit/trunk/debian/initscripts/preinst	2008-05-29 17:47:53 UTC (rev 1281)
@@ -15,7 +15,7 @@
 	CONFFILE="$1"
 
 	if [ -e "$CONFFILE" ]; then
-		CURRENT_MD5SUM="$`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+		CURRENT_MD5SUM="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
 		FACTORY_MD5SUM="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
 		if [ "$CURRENT_MD5SUM" != "$FACTORY_MD5SUM" ]; then
 			echo "Obsolete conffile $CONFFILE has been modified by you."