summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-18 22:23:44 +0000
committerKarl Berry <karl@freefriends.org>2016-04-18 22:23:44 +0000
commit81794ddb2a32c45772a8826df77aefd0715c2efd (patch)
tree15e1db3a871dcff8b1c34e3ad27646e8080710df /Master/texmf-dist/scripts
parent182f384a817a982e1f078a496b68cae8edacb777 (diff)
TLUtils.pm (setup_gpg): if the envvar is set, don't look for anything else.
tlmgr.pl (main): die if --verify-downloads and no gpg; only log if no gpg and only requested in config. git-svn-id: svn://tug.org/texlive/trunk@40601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl12
1 files changed, 8 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 6861341ba1a..e7060a3d1fa 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -622,7 +622,6 @@ for the full story.\n";
}
}
- #
# setup gpg if available
# first line: --(no-)verify-downloads was passed in (opts defined)
# second line: not passed in but in config
@@ -630,13 +629,18 @@ for the full story.\n";
||
(!defined($opts{"verify-downloads"}) && $config{"verify-downloads"})) {
if (TeXLive::TLUtils::setup_gpg($Master)) {
- log("Trying to verify cryptographic signatures!\n")
+ log("will verify cryptographic signatures\n")
} else {
- tlwarn("Couldn't detect gpg so will proceed without verification!\n");
+ my $prefix = "$prg: No gpg found"; # just to shorten the strings
+ if ($opts{"verify-downloads"}) {
+ tldie ("$prefix, verification explicitly requested, quitting.\n");
+ } else {
+ log ("$prefix, verification implicitly requested, "
+ . "continuing without verification\n");
+ }
}
}
-
my $ret = execute_action($action, @ARGV);
# F_ERROR stops processing immediately, and prevents postactions from