summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-18 03:02:35 +0000
committerNorbert Preining <norbert@preining.info>2020-05-18 03:02:35 +0000
commit277978fd69546e800dd8c46a0aec0d859d475ebb (patch)
tree1a7a961ac8af265db95936db4c0e8807eb97274e /systems/texlive/tlnet/tlpkg/TeXLive
parent71e57b1c98740d1fbb24981d390bd3ec8f2e967b (diff)
CTAN sync 202005180302
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm6
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm18
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm6
3 files changed, 15 insertions, 15 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
index 5ce0e3632e..516db3c051 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
@@ -1,4 +1,4 @@
-# $Id: TLCrypto.pm 54064 2020-03-04 01:25:36Z preining $
+# $Id: TLCrypto.pm 55178 2020-05-17 16:46:24Z karl $
# TeXLive::TLCrypto.pm - handle checksums and signatures.
# Copyright 2016-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -12,7 +12,7 @@ use TeXLive::TLConfig;
use TeXLive::TLUtils qw(debug ddebug win32 which platform
conv_to_w32_path tlwarn tldie);
-my $svnrev = '$Revision: 54064 $';
+my $svnrev = '$Revision: 55178 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -260,7 +260,7 @@ sub verify_checksum_and_check_return {
if ($is_main) {
tldie("$0: main database at $path is not signed: $m\n");
}
- debug("$0: remote database checksum is not signed, continuing anyway: $m\n");
+ debug("$0: remote database checksum is not signed, continuing anyway\n");
return(0, $r);
} elsif ($r == $VS_EXPKEYSIG) {
debug("$0: good signature bug gpg key expired, continuing anyway!\n");
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 1d5d2c02b1..cddf93f635 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 55126 2020-05-13 17:27:10Z karl $
+# $Id: TLUtils.pm 55178 2020-05-17 16:46:24Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2020 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 55126 $';
+my $svnrev = '$Revision: 55178 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2035,13 +2035,13 @@ sub add_link_dir_dir {
sub remove_link_dir_dir {
my ($from, $to) = @_;
if ((-d "$to") && (-w "$to")) {
- debug("removing links from $from to $to\n");
+ debug("TLUtils::remove_link_dir_dir: removing links from $from to $to\n");
chomp (@files = `ls "$from"`);
my $ret = 1;
foreach my $f (@files) {
next if (! -r "$to/$f");
if ($f eq "man") {
- debug("not considering man in $to, it should not be from us!\n");
+ debug("TLUtils::remove_link_dir_dir: not considering man in $to, it should not be from us!\n");
next;
}
if ((-l "$to/$f") &&
@@ -2049,7 +2049,7 @@ sub remove_link_dir_dir {
$ret = 0 unless unlink("$to/$f");
} else {
$ret = 0;
- tlwarn ("not removing $to/$f, not a link or wrong destination!\n");
+ tlwarn ("TLUtils::remove_link_dir_dir: not removing $to/$f, not a link or wrong destination!\n");
}
}
# try to remove the destination directory, it might be empty and
@@ -2057,7 +2057,7 @@ sub remove_link_dir_dir {
# `rmdir "$to" 2>/dev/null`;
return $ret;
} else {
- tlwarn ("destination $to not writable, no removal of links done!\n");
+ tlwarn ("TLUtils::remove_link_dir_dir: destination $to not writable, no removal of links done!\n");
return 0;
}
}
@@ -2087,7 +2087,7 @@ sub add_remove_symlinks {
# man
my $top_man_dir = "$Master/texmf-dist/doc/man";
- debug("$mode symlinks for man pages to $sys_man from $top_man_dir\n");
+ debug("TLUtils::add_remove_symlinks: $mode symlinks for man pages to $sys_man from $top_man_dir\n");
if (! -d $top_man_dir) {
; # better to be silent?
#info("skipping add of man symlinks, no source directory $top_man_dir\n");
@@ -2117,7 +2117,7 @@ sub add_remove_symlinks {
}
#`rmdir "$sys_man" 2>/dev/null` if ($mode eq "remove");
} else {
- tlwarn("man symlink destination ($sys_man) not writable, "
+ tlwarn("TLUtils::add_remove_symlinks: man symlink destination ($sys_man) not writable, "
. "cannot $mode symlinks.\n");
$errors++;
}
@@ -2126,7 +2126,7 @@ sub add_remove_symlinks {
# we collected errors in $errors, so return the negation of it
if ($errors) {
- info("$mode of symlinks had $errors error(s), see messages above.\n");
+ info("TLUtils::add_remove_symlinks: $mode of symlinks had $errors error(s), see messages above.\n");
return $F_ERROR;
} else {
return $F_OK;
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
index 9afc47f11e..b6b7f29d71 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
@@ -1,4 +1,4 @@
-# $Id: TLWinGoo.pm 54289 2020-03-14 10:46:20Z siepo $
+# $Id: TLWinGoo.pm 55175 2020-05-17 09:41:28Z siepo $
# TeXLive::TLWinGoo.pm - Windows goop.
# Copyright 2008-2018 Siep Kroonenberg, Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -11,7 +11,7 @@
package TeXLive::TLWinGoo;
-my $svnrev = '$Revision: 54289 $';
+my $svnrev = '$Revision: 55175 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -1424,7 +1424,7 @@ sub maybe_make_ro {
# /reset is necessary for removing non-standard existing permissions
my $cmd = 'cmd /c "icacls . /reset && icacls . /inheritance:r'.
' /grant:r *S-1-5-32-544:(OI)(CI)F'.
- ' /grant:r *S-1-5-11:(OI)(CI)RX /grant:r *S-1-5-32-545:(OI)(CI)RX /T"';
+ ' /grant:r *S-1-5-11:(OI)(CI)RX /grant:r *S-1-5-32-545:(OI)(CI)RX"';
log "Making read-only\n".`$cmd`."\n";
# go back to original directory