X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/50bf756320b9f47d119ed9524a0d7969e5e2c90f..02209392cbd41802e17bb4c6ded921594bb5d609:/divert.sh.in diff --git a/divert.sh.in b/divert.sh.in index 7e7659e..dc02de6 100644 --- 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() @@ -116,7 +116,7 @@ check_undivert_unlink() ourfile=$prefix$ours$suffix theirfile=$prefix$theirs$suffix - if dpkg-divert --list "$package" | \ + if LC_ALL=C dpkg-divert --list "$package" | \ grep -xFq "diversion of $file to $theirfile by $package"; then undivert_unlink "$prefix" "$suffix" fi @@ -126,7 +126,7 @@ check_undivert_unremove() { file=$1 removedfile=$2 - if dpkg-divert --list "$package" | \ + if LC_ALL=C dpkg-divert --list "$package" | \ grep -xFq "diversion of $file to $removedfile by $package"; then undivert_unremove "$file" fi