summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-12 06:12:51 +0000
committerNorbert Preining <preining@logic.at>2016-04-12 06:12:51 +0000
commitf5b4316e36bc6cd2b32ca5ef80cee92f15bb8555 (patch)
tree65769bf4e69862181fc76bbfb425a07a14c2b682
parented5df79528e81f334b3d8bcc732e4e8193173e1b (diff)
fixes from live testing
git-svn-id: svn://tug.org/texlive/trunk@40457 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl4
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm3
2 files changed, 4 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index ee9117222ab..6df9eed7c96 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5853,10 +5853,10 @@ sub setup_one_remotetlpdb {
ddebug("loc copy found!\n");
# we found the tlpdb matching the current location
# check for the remote hash
- my $path = "$location/$InfraLocation/$DatabaseName.checksum";
+ my $path = "$location/$InfraLocation/$DatabaseName.$TeXLive::TLConfig::ChecksumExtension";
ddebug("remote path of digest = $path\n");
- my ($ret, $msg) = TeXLive::TLUtils::verify_checksum($loc_copy_of_remote_tlpdb, "$path.checksum");
+ my ($ret, $msg) = TeXLive::TLUtils::verify_checksum($loc_copy_of_remote_tlpdb, $path);
if ($ret < 0) {
info(<<END_NO_INTERNET);
No connection to the internet.
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index bbed060353e..8cb9b6d4d79 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -171,7 +171,8 @@ sub from_fh {
$self->{$cmd} = $arg;
} elsif ($cmd eq 'containerchecksum' || $cmd eq 'srccontainerchecksum'
|| $cmd eq 'doccontainerchecksum') {
- $arg =~ /^[a-f0-9]{$ChecksumLength}$/ or die "Invalid checksum value: $line!";
+ $arg =~ /^[a-f0-9]{$TeXLive::TLConfig::ChecksumLength}$/
+ or die "Invalid checksum value: $line!";
$self->{$cmd} = $arg;
} elsif ($cmd eq 'name') {
$arg =~ /^([-.\w]+)$/ or die("Invalid name: $line!");