X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/6df6dbb590c148ebb47f634f716d88ee834a1b77..50bf756320b9f47d119ed9524a0d7969e5e2c90f:/divert.sh.in

diff --git a/divert.sh.in b/divert.sh.in
index b705812..7e7659e 100644
--- a/divert.sh.in
+++ b/divert.sh.in
@@ -107,3 +107,27 @@ undivert_unremove()
     undivert_unlink_divert "$file"
 }
 
+check_undivert_unlink()
+{
+    prefix=$1
+    suffix=$2
+
+    file=$prefix$suffix
+    ourfile=$prefix$ours$suffix
+    theirfile=$prefix$theirs$suffix
+
+    if dpkg-divert --list "$package" | \
+	grep -xFq "diversion of $file to $theirfile by $package"; then
+	undivert_unlink "$prefix" "$suffix"
+    fi
+}
+
+check_undivert_unremove()
+{
+    file=$1
+    removedfile=$2
+    if dpkg-divert --list "$package" | \
+	grep -xFq "diversion of $file to $removedfile by $package"; then
+	undivert_unremove "$file"
+    fi
+}