summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm15
1 files changed, 6 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index dff38e4948c..ab34e246858 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -290,15 +290,12 @@ architectures as set in the options section (i.e., using option_archs)
sub available_architectures {
my $self = shift;
- return $self->option_archs;
-}
-
-sub old_available_architectures {
- my $self = shift;
- my @packs = $self->list_packages;
- my @archs;
- # map { s@^$tltree/@@ ; push @nf, $_; } @files;
- map { s/^bin-tex\.// ; push @archs, $_ ; } grep(/^bin-tex\.(.*)$/, @packs);
+ my @archs = $self->option_archs;
+ if (! @archs) {
+ # fall back to the old method checking bin-tex\.*
+ my @packs = $self->list_packages;
+ map { s/^bin-tex\.// ; push @archs, $_ ; } grep(/^bin-tex\.(.*)$/, @packs);
+ }
return @archs;
}