summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
committerNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
commit0057c38056386ec2fa7171c13972417cd3d01241 (patch)
tree05f3738c4c3ab875f81302e5631919c28fe56719 /Master/tlpkg/TeXLive
parent4384299786a2e06413f870924dd95d2eb2e572fd (diff)
remove the "update from net" stuff, we will not support it but
will add support for adding binaries via tlmgr git-svn-id: svn://tug.org/texlive/trunk@7464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm8
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm28
2 files changed, 6 insertions, 30 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 48e97c8f9a2..f7dbc6c8cda 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -25,7 +25,6 @@ BEGIN {
$DiskArchive
$TeXLiveURL
$TeXLiveAlternativeURL
- $MaxBinOnCD
);
@EXPORT = @EXPORT_OK;
}
@@ -62,8 +61,6 @@ our $TeXLiveAlternativeURL;
#our $TeXLiveURL = 'http://mirror.ctan.org/systems/texlive/tlnet/2008';
#our $TeXLiveAlternativeURL = 'http://www.ctan.org/systems/texlive/tlnet/2008';
-our $MaxBinOnCD = 7;
-
1;
@@ -125,11 +122,6 @@ The assumed block size, currently 4k.
These values specify where to find packages.
-=item <$TeXLive::TLConfig::MaxBinOnCD>
-
-The maximum number of binary systems on the CD. This number must be
-smaller than the number of binaries available from the network.
-
=back
=head1 SEE ALSO
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index e0fa075e473..efd3aece132 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -53,7 +53,7 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure
TeXLive::TLUtils::create_fmtutil($tlpdb,$dest,$localconf);
TeXLive::TLUtils::create_updmap($tlpdb,$dest,$localconf);
TeXLive::TLUtils::create_language($tlpdb,$dest,$localconf);
- TeXLive::TLUtils::install_packages($from_tlpdb,$to_tlpdb,$what, $netarchsref, $opt_src, $opt_doc)>);
+ TeXLive::TLUtils::install_packages($from_tlpdb,$to_tlpdb,$what,$opt_src, $opt_doc)>);
TeXLive::TLUtils::install_package($what, $filelistref, $target, $platform);
=head2 Miscellaneous
@@ -508,22 +508,19 @@ sub copy {
=pod
-=item C<install_packages($from_tlpdb, $to_tlpdb, $what, $netarchsref, $opt_src, $opt_doc)>
+=item C<install_packages($from_tlpdb, $to_tlpdb, $what, $opt_src, $opt_doc)>
Installs the list of packages found in C<@$what> (a ref to a list) into
the TLPDB given by C<$to_tlpdb>. Information on files are taken from
the TLPDB C<$from_tlpdb>.
-C<$netarchrefs> is a reference to a list of arch/os combination which should
-be installed from the network.
-
C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should be
installed (currently implemented only for installation from DVD).
=cut
sub install_packages {
- my ($fromtlpdb,$totlpdb,$what,$netarchs,$opt_src,$opt_doc) = @_;
+ my ($fromtlpdb,$totlpdb,$what,$opt_src,$opt_doc) = @_;
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
foreach my $package (@$what) {
@@ -549,22 +546,9 @@ sub install_packages {
} elsif (-r "$::installerdir/$DiskArchive/$package.tar.lzma") {
$container = "$::installerdir/$DiskArchive/$package.tar.lzma";
} else {
- # ok, it could be a binary package which should be installed from
- # the net
- my $donefromnet = 0;
- foreach my $a (@$netarchs) {
- if ($package =~ m/\.$a$/) {
- # ok this is a binary we should install from the net
- $container = "$TeXLiveURL/$NetArchive/$package.$DefaultContainerExtension";
- $donefromnet = 1;
- last;
- }
- }
- if (!$donefromnet) {
- # for now only warn and return, should (?) be die!?
- warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/$DiskArchive\n";
- next;
- }
+ # for now only warn and return, should (?) be die!?
+ warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/$DiskArchive\n";
+ next;
}
} elsif (&media eq 'NET') {
$container = "$TeXLiveURL/$NetArchive/$package.$DefaultContainerExtension";