summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/tlpkg/libexec/place12
1 files changed, 10 insertions, 2 deletions
diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place
index 5b0d796e4ab..89fd94e90cc 100755
--- a/Master/tlpkg/libexec/place
+++ b/Master/tlpkg/libexec/place
@@ -131,13 +131,21 @@ if (!defined($tlpold)) {
#
my $diff_file = "$tmpfile.diff";
unlink ($diff_file);
+ #
+ # The --text is because we want to see the real changes, always.
+ # The space-related options are because those changes aren't real.
+ # (The diff is only run if the files are different according to our
+ # own test, so it's ok if the options eliminate all the diffs; it'll
+ # still get reported as needing an update.)
+ # The -s reports identical files.
+ #
my $diff_cmd = "diff --text --strip-trailing-cr --ignore-all-space -U 0 -s";
#
for my $f (@difffiles) {
my $master_file = "$M/$f";
my $cooked_file = "$cooked/$package/$f";
- # diff has no options for handling Mac line endings; the above
- # don't suffice. So use our own script for the initial comparison.
+ # diff has no options for handling Mac line endings,
+ # so use our own script for the initial comparison.
if (system ("cmp-textfiles '$master_file' '$cooked_file'") == 0) {
$identical++;
} else {