summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
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