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

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-23 13:05:27 +0000 (Wed, 23 Jan 2008)
New Revision: 1235

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/preinst
Log:
  * Correct file name in output when removing conffiles, to
    use the correct file ending .dpkg-old, not .dpkg-bak.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-20 15:17:53 UTC (rev 1234)
+++ sysvinit/trunk/debian/changelog	2008-01-23 13:05:27 UTC (rev 1235)
@@ -1,3 +1,10 @@
+sysvinit (2.86.ds1-53) UNRELEASED; urgency=low
+
+  * Correct file name in output when removing conffiles, to
+    use the correct file ending .dpkg-old, not .dpkg-bak.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 23 Jan 2008 14:04:18 +0100
+
 sysvinit (2.86.ds1-52) unstable; urgency=low
 
   * Rewrite conffile removal code in initscripts.preinst to use the

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2008-01-20 15:17:53 UTC (rev 1234)
+++ sysvinit/trunk/debian/initscripts/preinst	2008-01-23 13:05:27 UTC (rev 1235)
@@ -19,7 +19,7 @@
 		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-bak ..."
+			echo "Saving as $CONFFILE.dpkg-old ..."
 			mv -f "$CONFFILE" "$CONFFILE".dpkg-old
 		else
 			echo "Removing obsolete conffile $CONFFILE ..."