diff options
| author | Norbert Preining <preining@logic.at> | 2009-10-07 11:46:52 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2009-10-07 11:46:52 +0000 |
| commit | bd6d7e8aec8f17e431eeb83e77f8844c446de5fb (patch) | |
| tree | 67ce05e3e491f0b36ac58ab0556c6f7cda73f238 /Master/tlpkg/TeXLive | |
| parent | 4773e66b6b71c419406ad836e67997034ade6568 (diff) | |
include patches from Alexander Cherepanov
git-svn-id: svn://tug.org/texlive/trunk@15667 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 6 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TeXCatalogue.pm | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 0a2eae5bcfa..f5669398359 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -741,7 +741,6 @@ sub update_from_catalogue if (defined($self->catalogue)) { $tlcname = $self->catalogue; } elsif ($tlcname =~ m/^bin-(.*)$/) { - my $shortname = $1; if (!defined($tlc->entries->{$tlcname})) { $tlcname = $1; } @@ -749,6 +748,11 @@ sub update_from_catalogue $tlcname = lc($tlcname); if (defined($tlc->entries->{$tlcname})) { my $entry = $tlc->entries->{$tlcname}; + # Record the id of the catalogue entry if it's found due to + # quest4texlive. + if ($entry->entry->{'id'} ne $tlcname) { + $self->catalogue($entry->entry->{'id'}); + } if (defined($entry->entry->{'date'})) { my $foo = $entry->entry->{'date'}; $foo =~ s/^.Date: //; diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index 8ff06b08040..ca524411373 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -208,9 +208,11 @@ sub quest4texlive # Try to build the inverse mapping: my (%inv, %count); for my $id (keys %{$texcat}) { - if (defined($texcat->{$id}{'texlive'})) { - $count{$texcat->{$id}{'texlive'}}++; - $inv{$texcat->{$id}{'texlive'}} = $id; + my $tl = $texcat->{$id}{'texlive'}; + if (defined($tl)) { + $tl =~ s/^bin-//; + $count{$tl}++; + $inv{$tl} = $id; } } # Go through texlive names |