diff options
Diffstat (limited to 'Master/tlpkg/TeXLive')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 6 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLTREE.pm | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index bab1db1a1bc..9d2db75fc6b 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -379,7 +379,7 @@ sub make_tlpobj { # to match the pattern foreach my $arch (@todoarchs) { # get only those files matching the pattern - my @archfiles = $tltree->get_matching_files('bin',$finalp, $arch); + my @archfiles = $tltree->get_matching_files('bin',$finalp, $pkgname, $arch); if (!@archfiles) { if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on binpattern $finalp\n"); @@ -416,7 +416,7 @@ sub make_tlpobj { # to match the pattern foreach my $arch (@todoarchs) { # get only those files matching the pattern - my @archfiles = $tltree->get_matching_files('bin',$finalp, $arch); + my @archfiles = $tltree->get_matching_files('bin', $finalp, $pkgname, $arch); if (!@archfiles) { if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on negative binpattern $finalp\n") @@ -440,7 +440,7 @@ sub _do_normal_pattern { $is_default_pattern = 1; $p =~ s/^\*//; } - my @matchfiles = $tltree->get_matching_files($type,$p); + my @matchfiles = $tltree->get_matching_files($type, $p, $self->{'name'}); if (!$is_default_pattern && !@matchfiles && ($p !~ m,^f ignore,) && ($p !~ m,^d tlpkg/backups,)) { tlwarn("$self->{name}: no hit for pattern $p\n"); diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index c7b95c1ac4b..8300d78369b 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -203,22 +203,20 @@ sub size_of { =pod The function B<get_matching_files> takes as arguments the type of the pattern -(bin, src, doc, run), the pattern itself, and an options architecture. +(bin, src, doc, run), the pattern itself, the package name (without +.ARCH specifications), and an optional architecture. It returns a list of files matching that pattern (in the case of bin patterns for that arch). =cut sub get_matching_files { - my ($self, $type, $p, $arch) = @_; - if ($type eq "bin") { - my $ARCH = $arch; - my $newp; - eval "\$newp = \"$p\""; - return($self->_get_matching_files($type,$newp)); - } else { # non-bin pattern - return($self->_get_matching_files($type,$p)); - } + my ($self, $type, $p, $pkg, $arch) = @_; + my $ARCH = $arch; + my $PKGNAME = $pkg; + my $newp; + eval "\$newp = \"$p\""; + return($self->_get_matching_files($type,$newp)); } |