diff options
| -rwxr-xr-x | Master/tlpkg/bin/place | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/place b/Master/tlpkg/bin/place index 4f04681f595..1db145c34f2 100755 --- a/Master/tlpkg/bin/place +++ b/Master/tlpkg/bin/place @@ -114,13 +114,13 @@ if (!defined($tlpold)) { foreach (sort @newfiles) { `echo $_ >> $TMP/tlplace.new`; } - print `comm -3 $TMP/tlplace.new $TMP/tlplace.old`; - my @difffiles = `comm -12 $TMP/tlplace.new $TMP/tlplace.old`; + print `LC_ALL=C comm -3 $TMP/tlplace.new $TMP/tlplace.old`; + my @difffiles = `LC_ALL=C comm -12 $TMP/tlplace.new $TMP/tlplace.old`; chomp (@difffiles); my $sum = 0; my $diff_file = "$TMP/tlplace.diff"; unlink ($diff_file); - my $diff_cmd = "diff --text --ignore-all-space -U 0 -s"; + my $diff_cmd = "LC_ALL=C diff --text --strip-trailing-cr --ignore-all-space -U 0 -s"; foreach (@difffiles) { my @foo = `$diff_cmd $M/$_ $cooked/$package/$_ | tee -a $diff_file`; $sum += $#foo; # zero-based, so first line doesn't count. |