diff options
author | Karl Berry <karl@freefriends.org> | 2015-12-08 21:47:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-12-08 21:47:09 +0000 |
commit | 5db0950ba6b90723a352862042de9231540decfc (patch) | |
tree | 9216a8cf931c9faf8342e3cda8f65a1807e395cb /Master/tlpkg/TeXLive | |
parent | a6fd5c09b9e642613317ee3fd06d92be9548fd7b (diff) |
* bin/tlpfiles: doc tweaks.
* TeXLive/TLPDB.pm (find_file): no need for @foo.
* TeXLive/TLPSRC.pm (): include $lineno in non-continuation error.
* TeXLive/TLUtils.pm (parseAddFormatLine_line): doc.
git-svn-id: svn://tug.org/texlive/trunk@39054 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 2 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 811da76099b..90738ee0d54 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -815,14 +815,13 @@ containing a file named C<filename>. # TODO adapt for searching in *all* tags ??? sub find_file { my ($self,$fn) = @_; - my @ret; - foreach my $pkg ($self->list_packages) { - my @foo = $self->get_package($pkg)->contains_file($fn); - foreach my $f ($self->get_package($pkg)->contains_file($fn)) { - push @ret, "$pkg:$f"; + my @ret = (); + for my $pkg ($self->list_packages) { + for my $f ($self->get_package($pkg)->contains_file($fn)) { + push (@ret, "$pkg:$f"); } } - return(@ret); + return @ret; } =pod diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index b83c0d541d2..5505505258b 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -106,7 +106,7 @@ sub from_file { # (blank lines are significant in tlpobj, but not tlpsrc) if ($line =~ /^ /) { - die "$srcfile: non-continuation indentation not allowed: `$line'"; + die "$srcfile:$lineno: non-continuation indentation not allowed: `$line'"; } # remove terminal white space $line =~ s/\s+$//; diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index a0d09f7abab..b2c74c3a6ca 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -3059,7 +3059,11 @@ sub parse_AddHyphen_line { return %ret; } - +# +# return hash of items on AddFormat line LINE (which must not have the +# leading "execute AddFormat"). If parse fails, hash will contain a key +# "error" with a message. +# sub parse_AddFormat_line { my $line = shift; my %ret; |