From ae9ec747ab13e48ba02b4cc23893f0acdc430505 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 1 Jul 2009 05:15:09 +0000 Subject: add tlcmp from tlpkg/bin/cmp_textfiles to TLUtils, use it instead of the call to external diff in tlmgr check runfiles, do the runfile test if tlmgr check all is done git-svn-id: svn://tug.org/texlive/trunk@14045 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Master/texmf') diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 979ac2c373b..8f9b43358af 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -73,7 +73,7 @@ use TeXLive::TLPOBJ; use TeXLive::TLUtils; use TeXLive::TLWinGoo; TeXLive::TLUtils->import(qw(member info give_ctan_mirror win32 dirname - mkdirhier copy log debug)); + mkdirhier copy log debug tlcmp)); use TeXLive::TLPaper; @@ -2483,7 +2483,7 @@ sub action_check { $ret ||= check_files($tltree); $ret ||= check_depends(); $ret ||= check_executes(); - # we do NOT automatically run the runfiles check when called with "all" + $ret ||= check_runfiles(); } elsif ($what =~ m/^files/i) { my $tltree = init_tltree($svn); $ret ||= check_files($tltree); @@ -2662,8 +2662,7 @@ sub check_runfiles { # if all copies are identical, ok, else, complain my $diff = 0; for (my $i = 1; $i < scalar(@copies); $i++) { - if ($diff = system ("diff -q --strip-trailing-cr " - . "$Master/$copies[$i-1] $Master/$copies[$i] >/dev/null")) { + if ($diff = tlcmp("$Master/$copies[$i-1]", "$Master/$copies[$i]")) { print "# $f\ndiff $Master/$copies[$i-1] $Master/$copies[$i]\n"; last; } @@ -3653,8 +3652,6 @@ Live Database are present. =item B List those filenames that are occurring more than one time in the runfiles. -This test needs the C utility and so is not executed when C -is called without or with the C argument. =back -- cgit v1.2.3