debian: postinst: remove diversion after upgrade from stretch

closes: #919443

Reported-by: Andreas Beckmann <anbe@debian.org>
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>

diff --git a/debian/changelog b/debian/changelog
index cd62e83b66a40fa9811cbdb27bb3a5e8b44cbb39..44b69854103c8a0e3e7c8aa31a848abb85124662 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ifupdown2 (1.2.5-1) unstable; urgency=medium
+
+  * Fix: debian: postinst: remove diversion after upgrade from stretch
+         (closes: #919443)
+
+ -- Julien Fortin <julien@cumulusnetworks.com>  Wed, 16 Jan 2019 23:42:42 +0800
+
 ifupdown2 (1.2.4-1) unstable; urgency=medium
 
   * Fix: statemanager directory path customization via ifupdown2.conf

diff --git a/debian/ifupdown2.postinst b/debian/ifupdown2.postinst
index 09480356b8db884f9d0c40baf702468229229415..3689256ac189a5c2d0e4f5c8c95f4f677d364e7b 100644 (file)
--- a/debian/ifupdown2.postinst
+++ b/debian/ifupdown2.postinst
@@ -63,12 +63,35 @@ process_udev()
     fi
 }
 
+# restore file if we diverted it on install/upgrade
+_postinst_remove_diverts()
+{
+    diversions=$(LC_ALL=C.UTF-8 dpkg-divert --list | grep "^diversion of $1 .* by ifupdown2$"  | wc -l 2> /dev/null)
+    if [ $diversions -gt 0 ];
+    then
+        dpkg-divert --remove --package ifupdown2 --rename $1
+    fi
+}
+
+postinst_remove_diverts()
+{
+    for filename in ifup ifdown ifquery ifreload
+    do
+        _postinst_remove_diverts "/sbin/$filename"
+        _postinst_remove_diverts "/usr/share/bash-completion/completions/$filename"
+        _postinst_remove_diverts "/etc/bash_completion.d/$filename"
+        _postinst_remove_diverts "/usr/share/man/man8/$filename.8.gz"
+    done
+    _postinst_remove_diverts "/usr/share/man/man5/interfaces.5.gz"
+}
+
 case "$1" in
     configure)
         fix_dhclient_file_with_space
         process_etc_network_interfaces
         process_udev
         chmod +x /usr/share/ifupdown2/__main__.py
+        postinst_remove_diverts
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)