summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPOBJ.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-24 17:01:54 +0000
committerNorbert Preining <preining@logic.at>2008-06-24 17:01:54 +0000
commitb4c6b509398b8318ab06c3a493336fc11886a841 (patch)
tree63b9069a8af0f44c3f5439047371caff0c798550 /Master/tlpkg/TeXLive/TLPOBJ.pm
parent5b301db3bcc95ab74daa289778bc516421554070 (diff)
TLPOBJ.pm: update_from_catalogue strips the bin- prefix if neither the
catalogue key is set nor there is an entry for the full package name in the catalogue. So bin-aleph gets now the information of aleph etc. git-svn-id: svn://tug.org/texlive/trunk@8979 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPOBJ.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 6419f99b335..f1a7fd92d16 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -601,7 +601,15 @@ sub total_size {
sub update_from_catalogue {
my ($self, $tlc) = @_;
- my $tlcname = defined($self->catalogue) ? $self->catalogue : $self->name;
+ my $tlcname = $self->name;
+ if (defined($self->catalogue)) {
+ $tlcname = $self->catalogue;
+ } elsif ($tlcname =~ m/^bin-(.*)$/) {
+ my $shortname = $1;
+ if (!defined($tlc->entries->{$tlcname})) {
+ $tlcname = $1;
+ }
+ }
if (defined($tlc->entries->{$tlcname})) {
my $entry = $tlc->entries->{$tlcname};
if (defined($entry->entry->{'date'})) {