verification reporting reworked: be non-intrusive

git-svn-id: svn://tug.org/texlive/trunk@40640 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 4 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 8c419844a45..0576c5d7767 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5819,7 +5819,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:\n");
+  info("$prg: package repositories" . 
+    ($::gpg ? " (all verified)" : "") . ":\n");
   info("\tmain = " . $repos{'main'} . "\n");
   for my $t (@tags) {
     if ($t ne 'main') {
@@ -5858,7 +5859,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\n");
+  info("$prg: package repository $location" . 
+    ($::gpg ? " (verified)" : "") . "\n");
   return 1;
 }
 
@@ -5917,12 +5919,19 @@ END_NO_INTERNET
         $remotetlpdb = TeXLive::TLPDB->new(root => $location,
           tlpdbfile => $loc_copy_of_remote_tlpdb);
         $local_copy_tlpdb_used = 1;
-      } elsif ($ret > 0) {
+      } elsif ($ret == 1) {
         # no problem, checksum is wrong, we need to get new tlpdb
-      } else {
+      } elsif ($ret == 2) {
+        # umpf, signature error
+        # TODO should we die here? Probably yes because one of 
+        # checksum file or signature file has changed!
+        tldie("$0: verification of checksum for $location failed: $msg\n");
+      } elsif ($ret == 0) {
         $remotetlpdb = TeXLive::TLPDB->new(root => $location,
           tlpdbfile => $loc_copy_of_remote_tlpdb);
         $local_copy_tlpdb_used = 1;
+      } else {
+        tldie("$0: unexpected return value from verify_checksum: $ret\n");
       }
     }
   }