From aec43c7830a63c5cc82c699f4490862af0d91958 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 5 Jun 2010 16:31:31 +0000 Subject: various changes: - install-tl: try to add /systems/texlive/tlnet if initial download does not succeed - TLDownload errorcount/enable/disable support (used in install-tl) - TLUtils: check for TLDownload enabled status - TLPDB: remove warning about unsuccessfull download of .tlpdb, it is now in tlmgr (where it was already) and install-tl. git-svn-id: svn://tug.org/texlive/trunk@18756 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'Master/install-tl') diff --git a/Master/install-tl b/Master/install-tl index d21bc841204..bd24f67ac5b 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1227,7 +1227,42 @@ sub load_tlpdb { info("Loading $master/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName\n"); $tlpdb=TeXLive::TLPDB->new(root => "$master"); if (!defined($tlpdb)) { - die "$0: Could not load TeX Live Database from $master, goodbye.\n"; + my $do_die = 1; + # if that failed, and: + # - we are installing from the network + # - the location string does not contain "tlnet" + # then we simply add "/systems/texlive/tlnet" in case someone just + # gave an arbitrary CTAN mirror address without the full path + if ($media eq "NET" && $location !~ m/tlnet/) { + tlwarn("First attempt for net installation failed.\n"); + tlwarn("Location string does not contain \"tlnet\",\n"); + tlwarn("so we retry adding \"/systems/texlive/tlnet\".\n"); + $location .= "/systems/texlive/tlnet"; + $master = $location; + # + # since we change location, we reset the error count of the + # download object + $::tldownload_server->enable if (defined($::tldownload_server)); + # + $tlpdb=TeXLive::TLPDB->new(root => "$master"); + if (!defined($tlpdb)) { + tlwarn("Also that one did not help.\n"); + tlwarn(<option("install_docfiles"); -- cgit v1.2.3