From 3d4e2b16578e14f89bb5f839904ccd756a06da73 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:46:25 +0000 Subject: * debian/network-manager.preinst - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1673 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.preinst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'debian/network-manager.preinst') diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 60db6ae0..3f737448 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,11 +18,12 @@ # Prepare to remove a no-longer used conffile prep_rm_conffile() { - CONFFILE="$1" + PKGNAME="$1" + CONFFILE="$2" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" if [ "$md5sum" != "$old_md5sum" ]; then echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak" mv -f "$CONFFILE" "$CONFFILE".dpkg-bak @@ -46,8 +47,8 @@ case "$1" in if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi - prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager - prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher fi ;; -- cgit 1.3.0-6-gf8a5