summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-12 06:11:21 +0000
committerNorbert Preining <preining@logic.at>2016-04-12 06:11:21 +0000
commit6a22f5f0018dc68b01d241a55c514a7f8755dd11 (patch)
treedd30f53ab68f7d798defecb946693aec6286a17b /Master/texmf-dist
parent601410ed8ee3c502bc016ac493666002013d217d (diff)
make verify_* return values numeric with informal messages
git-svn-id: svn://tug.org/texlive/trunk@40449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl19
1 files changed, 7 insertions, 12 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index a0f7a2d27fa..ee9117222ab 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5857,9 +5857,8 @@ sub setup_one_remotetlpdb {
ddebug("remote path of digest = $path\n");
my ($ret, $msg) = TeXLive::TLUtils::verify_checksum($loc_copy_of_remote_tlpdb, "$path.checksum");
- if (!$ret) {
- if (($msg eq "file not found") || ($msg eq "read error") || ($msg eq "digest not found")) {
- info(<<END_NO_INTERNET);
+ if ($ret < 0) {
+ info(<<END_NO_INTERNET);
No connection to the internet.
Unable to download the checksum of the remote TeX Live database,
but found a local copy so using that.
@@ -5871,15 +5870,11 @@ http://tug.org/texlive/doc/install-tl.html
END_NO_INTERNET
# above text duplicated in install-tl
-
- $remotetlpdb = TeXLive::TLPDB->new(root => $location,
- tlpdbfile => $loc_copy_of_remote_tlpdb);
- $local_copy_tlpdb_used = 1;
- } elsif ($msg eq "checksum error") {
- # no problem, reload it!
- } else {
- tlwarn("Unknown return message from verify_checksum: $msg\n");
- }
+ $remotetlpdb = TeXLive::TLPDB->new(root => $location,
+ tlpdbfile => $loc_copy_of_remote_tlpdb);
+ $local_copy_tlpdb_used = 1;
+ } elsif ($ret > 0) {
+ # no problem, checksum is wrong, we need to get new tlpdb
} else {
debug("checksum of local copy identical with remote hash\n");
$remotetlpdb = TeXLive::TLPDB->new(root => $location,