r11231 - in /desktop/unstable/gnome-vfs2/debian: changelog libgnomevfs2-common.preinst libgnomevfs2-extra.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jun  1 07:34:11 2007
New Revision: 11231

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11231
Log:
* libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use 
  dpkg-query instead of parsing the status file directly.

Modified:
    desktop/unstable/gnome-vfs2/debian/changelog
    desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst
    desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst

Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=11231&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Fri Jun  1 07:34:11 2007
@@ -1,3 +1,10 @@
+gnome-vfs2 (1:2.18.1-3) UNRELEASED; urgency=low
+
+  * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use 
+    dpkg-query instead of parsing the status file directly.
+
+ -- Josselin Mouette <joss at debian.org>  Fri,  1 Jun 2007 09:32:31 +0200
+
 gnome-vfs2 (1:2.18.1-2) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst?rev=11231&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst Fri Jun  1 07:34:11 2007
@@ -3,11 +3,12 @@
 set -e
 
 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/.* //;p}}\" /var/lib/dpkg/status`"
+	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`"
         if [ "$md5sum" != "$old_md5sum" ]; then
             echo "Obsolete conffile $CONFFILE has been modified by you."
             echo "Saving as $CONFFILE.dpkg-bak ..."
@@ -22,7 +23,7 @@
 case "$1" in
     install|upgrade)
     # The https method is now described in extra-modules.conf
-    rm_conffile /etc/gnome-vfs-2.0/modules/ssl-modules.conf
+    rm_conffile libgnomevfs2-common /etc/gnome-vfs-2.0/modules/ssl-modules.conf
     ;;
 esac
 

Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst?rev=11231&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst Fri Jun  1 07:34:11 2007
@@ -3,11 +3,12 @@
 set -e
 
 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/.* //;p}}\" /var/lib/dpkg/status`"
+	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`"
         if [ "$md5sum" != "$old_md5sum" ]; then
             echo "Obsolete conffile $CONFFILE has been modified by you."
             echo "Saving as $CONFFILE.dpkg-bak ..."
@@ -22,7 +23,7 @@
 case "$1" in
     install|upgrade)
     # The smb method is now described in extra-modules.conf
-    rm_conffile /etc/gnome-vfs-2.0/modules/smb-module.conf
+    rm_conffile libgnomevfs2-extra /etc/gnome-vfs-2.0/modules/smb-module.conf
     ;;
 esac