diff options
author | Norbert Preining <preining@logic.at> | 2016-04-21 02:42:47 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2016-04-21 02:42:47 +0000 |
commit | 800560e3139b1d2c41bc86a3fbf8659529ee39d8 (patch) | |
tree | b1028a226ce9ac27948b15424ae9babfd302584b /Master/texmf-dist/scripts | |
parent | ec007a1257638d2063647d9712b5ea5d41b1276a (diff) |
tlpdb: safe status of being verified, show status for each tlpdb
git-svn-id: svn://tug.org/texlive/trunk@40646 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 30446f90ce0..8efa365f719 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5820,12 +5820,15 @@ 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 ? "" : "not ") . "verified):\n"); - info("\tmain = " . $repos{'main'} . "\n"); + info("$prg: package repositories\n"); + info("\tmain = " . $repos{'main'} . " (" . + ($remotetlpdb->virtual_get_tlpdb('main')->is_verified ? "" : "not ") . + "verified)\n"); for my $t (@tags) { if ($t ne 'main') { - info("\t$t = " . $repos{$t} . "\n"); + info("\t$t = " . $repos{$t} . " (" . + ($remotetlpdb->virtual_get_tlpdb($t)->is_verified ? "" : "not ") . + "verified)\n"); } } return 1; @@ -5861,7 +5864,7 @@ sub _init_tlmedia { # depend on it: print "location-url\t$location\n" if $::machinereadable; info("$prg: package repository $location (" . - ($::gpg ? "" : "not ") . "verified)\n"); + ($remotetlpdb->is_verified ? "" : "not ") . "verified)\n"); return 1; } @@ -5904,7 +5907,7 @@ sub setup_one_remotetlpdb { ddebug("remote path of digest = $path\n"); my ($ret, $msg) = TeXLive::TLUtils::verify_checksum($loc_copy_of_remote_tlpdb, $path); - if ($ret < 0) { + if ($ret == -1) { info(<<END_NO_INTERNET); No connection to the internet. Unable to download the checksum of the remote TeX Live database, @@ -5920,6 +5923,9 @@ END_NO_INTERNET $remotetlpdb = TeXLive::TLPDB->new(root => $location, tlpdbfile => $loc_copy_of_remote_tlpdb); $local_copy_tlpdb_used = 1; + } elsif ($ret == -2) { + # the remote database has not be signed, warn + debug("$0: remote database is not signed, continuing anyway!\n"); } elsif ($ret == 1) { # no problem, checksum is wrong, we need to get new tlpdb } elsif ($ret == 2) { |