summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/texlive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-20 21:34:36 +0000
committerKarl Berry <karl@freefriends.org>2021-05-20 21:34:36 +0000
commit08ed3e5166f58580481c5582b29f838d9c808cff (patch)
tree8efbc367b5e2c078b441a0ac2c723a3294d175bc /Master/texmf-dist/scripts/texlive
parent45ccf8eddaea98619b950f2ea4b1c5e223c7335e (diff)
restore load_config_file placement to pre-r59273, too broken
git-svn-id: svn://tug.org/texlive/trunk@59287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/texlive')
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS5
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl12
2 files changed, 9 insertions, 8 deletions
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index db74fe49893..2c6eb7b4240 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,6 +1,11 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr 59208 (released 15may21):</b>
+<li>still trying to optimize the ssl multiplexor resolution.
+
+<p><b>tlmgr 59154 (released 10may21):</b>
+<li>more adaptations for https://mirror.ctan.org (and again on 14may21).
<p><b>tlmgr 59108 (released 7may21):</b>
<li>support, and prefer, curl for https://mirror.ctan.org resolution.
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 5a8ecd4e52f..e45fe357a22 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -390,9 +390,6 @@ sub main {
}
}
}
-
- # why is this option so special? help ...
- $opts{"require-verification"} = 0;
# save command line options for later restart, if necessary
@::SAVEDARGV = @ARGV;
@@ -401,11 +398,6 @@ sub main {
GetOptions(\%opts, keys(%optarg)) or pod2usage(2);
- # load the config file and set the config options
- # load it BEFORE starting downloads as we set persistent-downloads there!
- load_config_file();
-
-
$::debug_translation = 0;
$::debug_translation = 1 if $opts{"debug-translation"};
@@ -677,6 +669,10 @@ for the full story.\n";
$loadmediasrcerror = "Cannot load TeX Live database from ";
+ # load the config file and set the config options
+ # load it BEFORE starting downloads as we set persistent-downloads there!
+ load_config_file();
+
# in system mode verify that the selected action is allowed
if (!$opts{"usermode"} && $config{'allowed-actions'}) {
if (!TeXLive::TLUtils::member($action, @{$config{'allowed-actions'}})) {