summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPOBJ.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-10-07 11:46:52 +0000
committerNorbert Preining <preining@logic.at>2009-10-07 11:46:52 +0000
commitbd6d7e8aec8f17e431eeb83e77f8844c446de5fb (patch)
tree67ce05e3e491f0b36ac58ab0556c6f7cda73f238 /Master/tlpkg/TeXLive/TLPOBJ.pm
parent4773e66b6b71c419406ad836e67997034ade6568 (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/TLPOBJ.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm6
1 files changed, 5 insertions, 1 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: //;