diff options
author | Karl Berry <karl@freefriends.org> | 2011-08-14 23:19:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-08-14 23:19:52 +0000 |
commit | c5cbf36f9cc3123fc768474320b45a8f67fdb7df (patch) | |
tree | 7e55e0ab4db214463125c52089349c15f29cbcb5 /Master | |
parent | 04dc31dcd61adf9924a90ff4d450ab25b3010646 (diff) |
(do_tlp): do not check for multiple occurrences of
a given TL file.
git-svn-id: svn://tug.org/texlive/trunk@23560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 2c4cd03001a..f8d84590c3f 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -480,8 +480,7 @@ my @TLP_no_check = ( exit (&main ()); -sub main -{ +sub main { chomp ($Master = `cd $mydir/../.. && pwd`); $tlpdb = TeXLive::TLPDB->new ("root" => $Master); die "Cannot find tlpdb in $Master!" unless defined $tlpdb; @@ -528,8 +527,7 @@ sub main # that is, excluding meta-packages and binary packages # (and hyphen for the moment) # -sub normal_tlps -{ +sub normal_tlps { my @normal; my $non_normal = `ls $Master/bin`; $non_normal =~ s/\n/\$|/g; @@ -543,8 +541,7 @@ sub normal_tlps # Return 1 if package needs updating, 0 if ok. # -sub do_tlp -{ +sub do_tlp { my ($tlpn) = @_; my $needed = 0; @@ -570,7 +567,12 @@ sub do_tlp my @compared = (); for my $file (@tl_files) { (my $basefile = $file) =~ s,^.*/,,; -#warn "checking file $file -> $basefile\n"; + + # if file exists by multiple names in TL (e.g., README), only check + # the first one we come across, since we'll only find the first one + # on CTAN and we don't want to try to match subdir suffixes. + next if grep { $_ eq "$basefile" } @tl_basefiles; +#warn "checking tl file $file -> $basefile\n"; push (@tl_basefiles, $basefile); # no point yet in comparing our pdfs, we have generated too many. @@ -660,8 +662,7 @@ sub do_tlp # 0 if files are the same, 1 if they are different. # -sub files_differ -{ +sub files_differ { my ($tl_file,$ctan_file) = @_; #warn "comparing $ctan_file $tl_file\n"; return system ("$mydir/cmp-textfiles $ctan_file $tl_file"); |