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

[pere at alioth.debian.org]

Author: pere
Date: 2008-02-11 07:48:00 +0000 (Mon, 11 Feb 2008)
New Revision: 1242

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/preinst
Log:
  * Fix shell quoting typo in conffile removal code (Closes: #464869).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-02-01 18:38:17 UTC (rev 1241)
+++ sysvinit/trunk/debian/changelog	2008-02-11 07:48:00 UTC (rev 1242)
@@ -1,3 +1,9 @@
+sysvinit (2.86.ds1-54) UNRELEASED; urgency=low
+
+  * Fix shell quoting typo in conffile removal code (Closes: #464869).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 01 Feb 2008 19:37:42 +0100
+
 sysvinit (2.86.ds1-53) unstable; urgency=low
 
   * Correct file name in output when removing conffiles, to

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2008-02-01 18:38:17 UTC (rev 1241)
+++ sysvinit/trunk/debian/initscripts/preinst	2008-02-11 07:48:00 UTC (rev 1242)
@@ -15,8 +15,8 @@
 	CONFFILE="$1"
 
 	if [ -e "$CONFFILE" ]; then
-		CURRENT_MD5SUM="$(md5sum '$CONFFILE' 2>/dev/null | sed -e 's/ .*//')"
-		FACTORY_MD5SUM="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\")"
+		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."
 			echo "Saving as $CONFFILE.dpkg-old ..."