Ticket #867: c-p-d-867.diff

divert.sh.in

@@ -19 +19 @@
 ours=#DEB_DIVERT_EXTENSION#
 theirs=#DEB_DIVERT_EXTENSION#-orig
 
+tmpdir="/var/cache/config-package-dev"
+
 divert_link_divert()
 {
     file=$1
@@ -131 +133 @@
         undivert_unremove "$file"
     fi
 }
+
+save_diverted_list()
+{
+    filename="$1"
+    rm -f "$tmpdir/$filename"
+    mkdir -p "$tmpdir"
+    touch "$tmpdir/$filename"
+    # Get the list of what the currently installed version of the 
+    # package diverts, from its Conflicts.  We can't simply use 
+    # dpkg-divert --list, because we can't guarantee that all 
+    # diversions by our package were created by c-p-d
+    diverted_files=$(dpkg-query -W -f '${Conflicts}' "$package" | perl -ne 'sub unparse {    $_ = $_[0];    return "/" unless $_;    return "_" if $_ eq "-";    return uc($_) if /^[a-z]$/;    s/^x//;    return chr hex $_;} s/\s+//g; print join(" ", map { if (/^diverts/) { s|^diverts-|/|; s/\+([^+]*)\+/unparse($1)/eg; (-e $_) ? $_ : "" } } split(",", $_));')
+    for f in $diverted_files; do
+        # It's possible we should explicitly check for diversion to 
+        # $theirs or diversion to /usr/share/$packge/(encoded name)
+        if LC_ALL=C dpkg-divert --list "$package" | \
+            grep -qx "diversion of $f to .* by $package"; then
+            echo $f >> "$tmpdir/$filename"
+        fi
+    done
+}
+
+cleanup_old_diversions() {
+    # Save the list of what we're diverting now
+    save_diverted_list "${package}.diversions-new"
+    if [ -f "$tmpdir/${package}.diversions-old" ]; then
+        for f in $(cat "$tmpdir/${package}.diversions-old"); do
+            # If we used to divert something and we now don't, punt it
+            if ! grep -xFq "$f" "$tmpdir/${package}.diversions-new"; then
+                echo "Cleaning up old diversion of $f" >&2
+                undivert_unlink "$f"
+            fi
+        done
+    fi
+    rm -f "$tmpdir/${package}.diversions-new"
+    rm -f "$tmpdir/${package}.diversions-old"
+}

debian/changelog

@@ +1 @@
+config-package-dev (4.14) unstable; urgency=low
+
+  * Add functions to divert.sh.in and code to the preinst to allow
+    config-package-dev to cleanup after itself without requiring manual
+    specification of undiversions/unremovals (Trac: #867)
+  * Write divert.sh.in to the preinst to enable the aforementioned feature
+  * Change the prerm to undivert on "deconfigure" as well as "remove"
+    operations (Trac: #388)
+
+ -- Jonathan Reed <jdreed@mit.edu>  Wed, 26 Sep 2012 11:01:46 -0400
+
 config-package-dev (4.13) unstable; urgency=low
 
   * Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in

debian/control

@@ -7 +7 @@
 Vcs-Git: git://andersk.mit.edu/config-package-dev.git
 Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
 Build-Depends: cdbs,
- debhelper (>= 6),
+ debhelper,
  dh-buildinfo
 Standards-Version: 3.9.2
 

divert.mk

@@ -30 +30 @@
 
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.5~)
 
-# divert.sh.in is included in the postinst/prerm scripts of packages
-# installing diversions using config-package-dev.
+# divert.sh.in is included in the preinst/postinst/prerm scripts of 
+# packages installing diversions using config-package-dev.
 DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
 # script used to encode the path of a file uniquely in a valid virtual
 # package name.
@@ -76 +76 @@
         set -e; \
         { \
             sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
+            echo 'if [ "$$1" = "configure" ]; then'; \
+            echo '    cleanup_old_diversions'; \
             $(if $(divert_files_all), \
-                echo 'if [ "$$1" = "configure" ]; then'; \
                 $(foreach file,$(divert_undivert_files), \
                     echo "    check_undivert_unlink $(call divert_files_replace_name,$(file), )"; )\
                 $(foreach file,$(divert_unremove_files), \
@@ -87 +88 @@
                 $(foreach file,$(divert_remove_files), \
                     mkdir -p debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg); \
                     echo "    divert_remove $(file) $(call remove_files_name,$(file))";) \
-                echo 'fi'; \
             ) \
+            echo 'fi'; \
         } >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
+# Add code to the preinst script to calculate the list
+# of diverted files from the previous (if any) version
+        set -e; \
+        { \
+            sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
+            echo 'case "$$1" in'; \
+            echo '    install|upgrade)'; \
+            echo '        if [ -n "$$2" ]; then'; \
+            echo '            save_diverted_list "$${package}.diversions-old"'; \
+            echo '        fi'; \
+            echo '        ;;'; \
+            echo 'esac'; \
+        } >> $(CURDIR)/debian/$(cdbs_curpkg).preinst.debhelper
 # Add code to prerm script to undo diversions when package is removed.
         set -e; \
         { \
@@ -99 +113 @@
                 fi;) \
             sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
             $(if $(divert_files_thispkg), \
-                echo 'if [ "$$1" = "remove" ]; then'; \
+                echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \
                 $(foreach file,$(call reverse_dh_compat_5,$(divert_files)), \
                     echo "    undivert_unlink $(call divert_files_replace_name,$(file), )";) \
                 $(foreach file,$(call reverse_dh_compat_5,$(divert_remove_files)), \