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
theirfile=$prefix$theirs$suffix
undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
- undivert_unlink_divert "$file" "$package"
+ undivert_unlink_divert "$file"
}
undivert_unremove()
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
{
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