summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-21 02:14:22 +0000
committerNorbert Preining <preining@logic.at>2016-04-21 02:14:22 +0000
commitec007a1257638d2063647d9712b5ea5d41b1276a (patch)
treeb61d1a18843cae542d4fccdb82fb90c948fdfc2a /Master
parent4d84dd5e3cb5edb498c9e82fd7be9c4fb72a4c26 (diff)
tlmgr: further silencing gpg related messages
if implicitly asked to sign but no gpg found, do *not* issue a warning, but *always* report whether the repositories have been verified or not. git-svn-id: svn://tug.org/texlive/trunk@40645 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 0576c5d7767..30446f90ce0 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5722,8 +5722,9 @@ sub handle_gpg_config_settings {
# verification explicitely requested in config file, but not gpg, die
tldie("$prefix, verification explicitly requested in config file, quitting.\n");
}
- # it was requested via the default setting, so just warn
- info ("$prefix, verification implicitly requested, "
+ # it was requested via the default setting, so just debug it
+ # the list of repositories will contain verified/not verified statements
+ debug ("$prefix, verification implicitly requested, "
. "continuing without verification\n");
}
} else {
@@ -5819,8 +5820,8 @@ sub init_tlmedia {
# this "location-url" line should not be changed since GUI programs
# depend on it:
print "location-url\t$locstr\n" if $::machinereadable;
- info("$prg: package repositories" .
- ($::gpg ? " (all verified)" : "") . ":\n");
+ info("$prg: package repositories (" .
+ ($::gpg ? "" : "not ") . "verified):\n");
info("\tmain = " . $repos{'main'} . "\n");
for my $t (@tags) {
if ($t ne 'main') {
@@ -5859,8 +5860,8 @@ sub _init_tlmedia {
# this "location-url" line should not be changed since GUI programs
# depend on it:
print "location-url\t$location\n" if $::machinereadable;
- info("$prg: package repository $location" .
- ($::gpg ? " (verified)" : "") . "\n");
+ info("$prg: package repository $location (" .
+ ($::gpg ? "" : "not ") . "verified)\n");
return 1;
}