Package: iptables-persistent
Version: 0.5.3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise

Using 'dpkg-maintscript-helper supports rm_conffile' guards introduces
unreliability into upgrades; it means that the conffile is removed or
not depending on whether dpkg happens to be unpacked before fonts-f500.
This seems generally undesirable; it would be better to enforce a single
code path.  (This is academic for Debian because the version of dpkg in
squeeze supported dpkg-maintscript-helper, hence Severity: wishlist;
Ubuntu's last LTS release didn't have a sufficient version of dpkg for
that which is why I care.)

It would be nice to just use dh_installdeb's support for generating
dpkg-maintscript-helper commands (I've sent patches for many other
packages today to that effect).  However, I couldn't make this work in
the context of this package's postinst, because the code inserted by
dh_installinit must come after your hand-written postinst code while the
code generated by dh_installdeb would have to come before it.  This
patch is still a simplification, though.

  * Pre-Depend on a sufficient version of dpkg rather than using
    'dpkg-maintscript-helper supports' guards.

diff -Nru iptables-persistent-0.5.3/debian/control 
iptables-persistent-0.5.3ubuntu1/debian/control
--- iptables-persistent-0.5.3/debian/control    2011-11-29 00:14:42.000000000 
+0000
+++ iptables-persistent-0.5.3ubuntu1/debian/control     2012-02-13 
16:13:34.000000000 +0000
@@ -9,6 +9,7 @@
 
 Package: iptables-persistent
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2~)
 Depends: iptables, lsb-base, ${misc:Depends}
 Description: boot-time loader for iptables rules
  This package provides a system startup script that restores iptables
diff -Nru iptables-persistent-0.5.3/debian/iptables-persistent.postinst 
iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.postinst
--- iptables-persistent-0.5.3/debian/iptables-persistent.postinst       
2011-11-29 00:14:42.000000000 +0000
+++ iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.postinst        
2012-02-13 16:12:47.000000000 +0000
@@ -5,10 +5,8 @@
 # Source debconf library
 . /usr/share/debconf/confmodule
 
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile \
-        /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
-fi
+dpkg-maintscript-helper mv_conffile \
+    /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
 
 case "$1" in
 configure)
diff -Nru iptables-persistent-0.5.3/debian/iptables-persistent.postrm 
iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.postrm
--- iptables-persistent-0.5.3/debian/iptables-persistent.postrm 2011-11-29 
00:14:42.000000000 +0000
+++ iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.postrm  
2012-02-13 16:12:52.000000000 +0000
@@ -2,10 +2,8 @@
 
 set -e
 
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile \
-         /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
-fi
+dpkg-maintscript-helper mv_conffile \
+     /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
 
 case "$1" in
 purge)
diff -Nru iptables-persistent-0.5.3/debian/iptables-persistent.preinst 
iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.preinst
--- iptables-persistent-0.5.3/debian/iptables-persistent.preinst        
2011-11-29 00:14:42.000000000 +0000
+++ iptables-persistent-0.5.3ubuntu1/debian/iptables-persistent.preinst 
2012-02-13 16:12:42.000000000 +0000
@@ -2,9 +2,7 @@
 
 set -e
 
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile \
-         /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
-fi
+dpkg-maintscript-helper mv_conffile \
+     /etc/iptables/rules /etc/iptables/rules.v4 0.0.20101230 -- "$@"
 
 #DEBHELPER#

Thanks,

-- 
Colin Watson                                       [cjwat...@ubuntu.com]



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to