ignore trailing newlines in comparison

git-svn-id: svn://tug.org/texlive/trunk@17824 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 8 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/Test-philosophy-classic.tex b/Master/texmf-dist/doc/latex/biblatex-philosophy/Test-philosophy-classic.tex
index cfe5df008b8..86f1b398d68 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/Test-philosophy-classic.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/Test-philosophy-classic.tex
@@ -43,7 +43,8 @@ hyperref,
 %\renewcommand{\annotationfont}{}
 %\renewcommand{\libraryfont}{\sffamily}
 %\renewcommand*{\volnumpunct}{/}
-%\renewcommand*{\volumfont}{}%\renewcommand*{\volumfont}{\scshape}
+%\renewcommand*{\volumfont}{}
+%\renewcommand*{\volumfont}{\scshape}
 %%-------------------------------------------------------
 
 
diff --git a/Master/tlpkg/bin/cmp-textfiles b/Master/tlpkg/bin/cmp-textfiles
index 439fa1c0f28..bfa347a7138 100755
--- a/Master/tlpkg/bin/cmp-textfiles
+++ b/Master/tlpkg/bin/cmp-textfiles
@@ -19,6 +19,8 @@ END_USAGE
   
   my $file1 = &read_file ($ARGV[0]);
   my $file2 = &read_file ($ARGV[1]);
+  warn "($ARGV[0])\n$file1!!!\n";
+  warn "($ARGV[1])\n$file2===\n";
   
   return $file1 eq $file2 ? 0 : 1;
 }
@@ -41,5 +43,9 @@ sub read_file
   }
   close (FILE) || warn "close($fname) failed: $!";
 
+  # if the file did not have a trailing newline, add one for purposes of
+  # comparison, since it can slip in if we edit it, etc.
+  $ret .= "\n" if substr ($ret, -1) ne "\n";
+  
   return $ret;
 }