[Python-apps-commits] r678 - in packages/pypolicyd-spf/trunk/debian (2 files)

[kitterma-guest at users.alioth.debian.org]

    Date: Thursday, February 21, 2008 @ 21:16:02
  Author: kitterma-guest
Revision: 678

Fix up conf file moving changes.

Modified:
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst

Modified: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	2008-02-21 20:54:35 UTC (rev 677)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	2008-02-21 21:16:02 UTC (rev 678)
@@ -12,13 +12,13 @@
         fi
         mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
         mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-        rm -rf "/etc/python-policyd-spf/"
+        test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
     fi
 }
 
 case "$1" in
 configure)
-    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+    if dpkg --compare-versions "$2" le "0.5.2-3"; then
         mv_conffile "/etc/python-policyd-spf/policyd-spf.conf" \
           "/etc/postfix-policyd-spf-python/policyd-spf.conf"
     fi

Modified: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst	2008-02-21 20:54:35 UTC (rev 677)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst	2008-02-21 21:16:02 UTC (rev 678)
@@ -8,14 +8,15 @@
         md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
         old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
         if [ "$md5sum" = "$old_md5sum" ]; then
-            rm -f "/etc/python-policyd-spf"
+            rm $CONFFILE
+            test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
         fi
     fi
 }
 
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+    if dpkg --compare-versions "$2" le "0.5.2-3"; then
         prep_mv_conffile "/etc/python-policyd-spf/policyd-spf.conf"
     fi