summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl2
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl4
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm11
-rwxr-xr-xMaster/tlpkg/bin/tlpsrc2tlpdb2
4 files changed, 10 insertions, 9 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 86332fdb85f..1e988095ceb 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -829,7 +829,7 @@ sub save_options_into_tlpdb {
if ($vars{$_}) { push @archs, $1; }
}
}
- $localtlpdb->option_available_archs(@archs);
+ $localtlpdb->option_available_architectures(@archs);
$localtlpdb->save() unless $vars{'from_dvd'};
}
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 62a3b53fc4f..ea9b1197496 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -832,9 +832,9 @@ sub action_arch {
merge_into (\%ret, $tlmediasrc->install_package("bin-tlpsv.win32", $localtlpdb, 1, 0));
}
# update the option_archs list of installed archs
- my @larchs = $localtlpdb->option_available_archs;
+ my @larchs = $localtlpdb->option_available_architectures;
push @larchs, @todoarchs;
- $localtlpdb->option_available_archs(@larchs);
+ $localtlpdb->option_available_architectures(@larchs);
$localtlpdb->save;
} else {
die "Unknown option for arch: $what";
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index a8e00e67f65..5e990d8795a 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -285,13 +285,14 @@ sub save {
=item C<< $tlpdb->available_architectures >>
The C<available_architectures> functions returns the list of available
-architectures as set in the options section (i.e., using option_available_archs)
+architectures as set in the options section
+(i.e., using option_available_architectures)
=cut
sub available_architectures {
my $self = shift;
- my @archs = $self->option_available_archs;
+ my @archs = $self->option_available_architectures;
if (! @archs) {
# fall back to the old method checking bin-tex\.*
my @packs = $self->list_packages;
@@ -828,10 +829,10 @@ sub _option_value {
return;
}
-sub option_available_archs {
+sub option_available_architectures {
my $self = shift;
- if (@_) { $self->_set_option_value("available_archs","@_"); }
- my @archs = split ' ', $self->_option_value("available_archs");
+ if (@_) { $self->_set_option_value("available_architectures","@_"); }
+ my @archs = split ' ', $self->_option_value("available_architectures");
return @archs;
}
sub option_create_symlinks {
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index e5145c0be7b..afd12d47f49 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -110,7 +110,7 @@ sub main
if ($opt_all) {
$tldb->root("$opt_master");
# do set the option_archs from the dirs in Master/bin
- $tldb->option_available_archs($tltree->architectures);
+ $tldb->option_available_architectures($tltree->architectures);
$tldb->save;
info("$0: wrote $src_count packages to ". $tldb->root . ".\n");
} else {