[Pkg-utopia-commits] r1673 - in /packages/unstable/networkmanager/debian: changelog network-manager.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Aug 26 18:46:25 2007
New Revision: 1673

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1673
Log:
* debian/network-manager.preinst
  - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead.

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/network-manager.preinst

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=1673&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Sun Aug 26 18:46:25 2007
@@ -8,8 +8,10 @@
     - debian/patches/09_fix_bigendian_words.patch
     - debian/patches/12_dbus1.0.patch
     - debian/patches/13-wep_capabilities
-
- -- Michael Biebl <biebl at debian.org>  Sat, 25 Aug 2007 00:21:49 +0200
+  * debian/network-manager.preinst
+    - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 26 Aug 2007 20:46:05 +0200
 
 network-manager (0.6.4-8) unstable; urgency=low
 

Modified: packages/unstable/networkmanager/debian/network-manager.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.preinst?rev=1673&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.preinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.preinst Sun Aug 26 18:46:25 2007
@@ -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 @@
 	    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
 	;;