summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-06-10 16:43:20 +0000
committerKarl Berry <karl@freefriends.org>2008-06-10 16:43:20 +0000
commitf6b5fc56a4de1d5b386d21bdbf4655318685c680 (patch)
treeb89474fce684d98fcd53716b094430876ef22ab3
parent6c2e1a1985f555b2f5a05c090fc3f12a877ecaff (diff)
don't complain about w32-specific binpattern problems.
git-svn-id: svn://tug.org/texlive/trunk@8657 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm14
1 files changed, 10 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index c031c5a44d7..735e9714b52 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -333,7 +333,12 @@ sub make_tlpobj
@archfiles = @{$archmatches{$arch}};
}
if (!@archfiles) {
- tlwarn("binpattern without hit in $self->name ($arch): $p\n");
+ # many patterns are special for w32, don't complain about those.
+ # conversely, w32 fails to have many standard programs, don't
+ # complain about those either.
+ tlwarn("$self->{name} ($arch): no hit on binpattern $p\n")
+ unless ($p =~ m,/win32, && $arch ne "win32")
+ || ($p =~ m,\$\{ARCH\}, && $arch eq "win32");
}
$tlp->add_binfiles($arch,@archfiles);
}
@@ -349,14 +354,15 @@ sub make_tlpobj
@archfiles = @{$archmatches{$arch}};
}
if (!@archfiles) {
- tlwarn("negative binpattern without hit: ".$self->name.": $arch: $p\n");
+ tlwarn(" $self->{name} ($arch): no hit on negative binpattern $p\n");
+
}
$tlp->remove_binfiles($arch,@archfiles);
}
}
# add the revision number of the .tlpsrc file to the compute list:
$tlp->recompute_revision($tltree,
- $tltree->file_svn_lastrevision("tlpkg/tlpsrc/" . $self->name . ".tlpsrc"));
+ $tltree->file_svn_lastrevision("tlpkg/tlpsrc/$self->{name}.tlpsrc"));
$tlp->recompute_sizes($tltree);
return $tlp;
}
@@ -371,7 +377,7 @@ sub _do_normal_pattern {
my $matchref = $tltree->get_matching_files($type,$p);
my @matchfiles = @$matchref;
if (!$is_default_pattern && !@matchfiles && ($p !~ m/^f ignore/)) {
- tlwarn("pattern without hit in $self->name: $p\n");
+ tlwarn("$self->{name}: no hit for pattern $p\n");
}
if (defined($negative) && $negative == 1) {
$tlp->remove_files($type,@matchfiles);