Ticket #549: allow-undiversion-without-version-check.diff

divert.mk

@@ -72 +72 @@
                $(foreach file,$(divert_undivert_files), \
                    $(if $(DEB_UNDIVERT_VERSION_$(file)),,\
                        echo "ERROR!  Missing undivert version for $(file)!">&2; exit 1;) \
+                   $(if $(DEB_UNDIVERT_VERSION_$(file)),all,\
+                   echo -n "    always_undivert_unlink $(call divert_files_replace_name,$(file), )") \
                    echo -n "    if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
                    echo "'$(DEB_UNDIVERT_VERSION_$(file))'; then"; \
                    echo "        undivert_unlink $(call divert_files_replace_name,$(file), )"; \
@@ -79 +81 @@
                $(foreach file,$(divert_unremove_files), \
                    $(if $(DEB_UNREMOVE_VERSION_$(file)),,\
                        echo "ERROR!  Missing unremove version for $(file)!">&2; exit 1;) \
+                   $(if $(DEB_UNREMOVE_VERSION_$(file)),all,\
+                   echo -n "    always_undivert_unremove $(file) /usr/share/$(cdbs_curpkg)/`$(DEB_DIVERT_ENCODER) $(file)`") \
                    echo -n "    if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
                    echo "'$(DEB_UNREMOVE_VERSION_$(file))'; then"; \
                    echo "        undivert_unremove $(file)"; \

divert.sh.in

@@ -107 +107 @@
     undivert_unlink_divert "$file"
 }
 
+always_undivert_unlink()
+{
+    file="$1"
+    if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${file}${theirs} by ${package}"; then
+       undivert_unlink "$file"
+    fi
+}
+
+always_undivert_unremove()
+{
+    file="$1"
+    removedfile="$2"
+    if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${removedfile} by ${package}"; then
+       undivert_unremove "$file"
+    fi
+}
+