divert.sh: Remove an unnecessary parameter passed to undivert_unlink_divert.

[config-package-dev.git] / divert.sh.in

diff --git a/divert.sh.in b/divert.sh.in
index b705812712a6906ad563292b8302a0b44b951f1e..dc02de6fb40cb41869875be09f2b98841429c8e3 100644 (file)
--- a/divert.sh.in
+++ b/divert.sh.in
@@ -24,7 +24,7 @@ divert_link_divert()
     file=$1
     ourfile=$2
     theirfile=$3
-    if ! dpkg-divert --list "$package" | \
+    if ! LC_ALL=C dpkg-divert --list "$package" | \
        grep -xFq "diversion of $file to $theirfile by $package"; then
        dpkg-divert --divert "$theirfile" --rename --package "$package" --add "$file"
     fi
@@ -98,7 +98,7 @@ undivert_unlink()
     theirfile=$prefix$theirs$suffix
 
     undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
-    undivert_unlink_divert "$file" "$package"
+    undivert_unlink_divert "$file"
 }
 
 undivert_unremove()
@@ -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 LC_ALL=C 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 LC_ALL=C dpkg-divert --list "$package" | \
+       grep -xFq "diversion of $file to $removedfile by $package"; then
+       undivert_unremove "$file"
+    fi
+}