summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-06 20:21:11 +0000
committerKarl Berry <karl@freefriends.org>2021-05-06 20:21:11 +0000
commita4f1ad2e946443c9836b07ea343efc308048043f (patch)
treeb6ec020aa2622aecce4fd752236381efbb37182e
parent0f22d2ffb285c68fcbdf39454df79af0f9f372aa (diff)
(writeout): dddebug, since this happens on every package in tlpdb; other debugging tweaks
git-svn-id: svn://tug.org/texlive/trunk@59098 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl17
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm8
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm8
-rwxr-xr-xMaster/tlpkg/bin/tl-try-install3
5 files changed, 22 insertions, 16 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index a5b0dd8bb1f..d6cc899fd70 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5379,6 +5379,7 @@ sub action_recreate_tlpdb {
$tlpdb->add_tlpobj($tlp);
}
# writeout the re-created tlpdb to stdout
+ &debug("tlmgr:action_recreate_tlpdb: writing out tlpdb\n");
$tlpdb->writeout;
return;
}
@@ -7220,14 +7221,16 @@ and the repository are not compatible:
# check for being frozen
if ($remotetlpdb->config_frozen) {
my $frozen_msg = <<FROZEN;
-TeX Live $TeXLive::TLConfig::ReleaseYear is frozen and will no longer
-be routinely updated. This happens when a new release is made.
+TeX Live $TeXLive::TLConfig::ReleaseYear is frozen
+and will no longer be routinely updated. This happens when a new
+release is made, or will be made shortly.
-If you're willing to help with pretesting the new release, and we hope
-you are, (when pretests are available), please read
-https://tug.org/texlive/pretest.html.
+If you're willing to help with pretesting a new release, and we hope
+you are, please see https://tug.org/texlive/pretest.html.
+
+For general status information about TeX Live, see its home page:
+https://tug.org/texlive
-Otherwise, just wait, and the new release will be ready in due time.
FROZEN
# don't die here, we want to allow updates even if tlnet is frozen!
tlwarn($frozen_msg);
@@ -7249,7 +7252,7 @@ FROZEN
# similar
&debug("Cannot save remote TeX Live database to $loc_copy_of_remote_tlpdb: $!\n");
} else {
- &debug("writing out tlpdb to $loc_copy_of_remote_tlpdb\n");
+ &debug("tlmgr:setup_one_remote_tlpdb: writing out remote tlpdb to $loc_copy_of_remote_tlpdb\n");
$remotetlpdb->writeout($tlfh);
close($tlfh);
# Remove all other copies of main databases in case different mirrors
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index af466e25a6b..337c7276ac8 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLPDB.pm - tlpdb plain text database files.
-# Copyright 2007-2020 Norbert Preining
+# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -98,7 +98,8 @@ use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory $InfraLocation
use TeXLive::TLCrypto;
use TeXLive::TLPOBJ;
use TeXLive::TLUtils qw(dirname mkdirhier member win32 info log debug ddebug
- tlwarn basename download_file merge_into tldie system_pipe);
+ tlwarn basename download_file merge_into tldie
+ system_pipe);
use TeXLive::TLWinGoo;
use Cwd 'abs_path';
@@ -424,7 +425,8 @@ sub writeout {
}
my $fd = (@_ ? $_[0] : STDOUT);
foreach (sort keys %{$self->{'tlps'}}) {
- ddebug("writeout: tlpname=$_ ", $self->{'tlps'}{$_}->name, "\n");
+ TeXLive::TLUtils::dddebug("writeout: tlpname=$_ ",
+ $self->{'tlps'}{$_}->name, "\n");
$self->{'tlps'}{$_}->writeout($fd);
print $fd "\n";
}
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index ca37c284c5e..e480f7e0834 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLPOBJ.pm - module for using tlpobj files
-# Copyright 2007-2019 Norbert Preining
+# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 35426399ed9..f2c9830fb72 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -656,8 +656,8 @@ sub run_cmd {
=item C<system_pipe($prog, $infile, $outfile, $removeIn, @extraargs)>
-Runs C<$prog> with C<@extraargs> redirecting stdin from C<$infile>, stdout to C<$outfile>.
-Removes C<$infile> if C<$removeIn> is true.
+Runs C<$prog> with C<@extraargs> redirecting stdin from C<$infile>,
+stdout to C<$outfile>. Removes C<$infile> if C<$removeIn> is true.
=cut
@@ -2394,7 +2394,7 @@ sub untar {
# quoting issues.
# so fall back on chdir in Perl.
#
- debug("unpacking $tarfile in $targetdir\n");
+ debug("TLUtils::untar: unpacking $tarfile in $targetdir\n");
my $cwd = cwd();
chdir($targetdir) || die "chdir($targetdir) failed: $!";
@@ -4585,7 +4585,7 @@ sub mktexupd {
}
-=item C<check_sys_user_mode($user,$sys,$tmfc, $tmfsc, $tmfv, $tmfsv)>
+=item C<setup_sys_user_mode($user,$sys,$tmfc, $tmfsc, $tmfv, $tmfsv)>
=cut
diff --git a/Master/tlpkg/bin/tl-try-install b/Master/tlpkg/bin/tl-try-install
index 2587a2b029d..0f05e3e49b5 100755
--- a/Master/tlpkg/bin/tl-try-install
+++ b/Master/tlpkg/bin/tl-try-install
@@ -16,7 +16,7 @@ mydir=`cd \`dirname "$real0"\` && pwd` # Master/tlpkg/bin
Master=`cd $mydir/../.. && pwd`
profiledir=$Master/tlpkg/dev/profiles
-opt= # -v -vv
+opt=
profile=$profiledir/TLinfra.pro
repo=$Master
@@ -24,6 +24,7 @@ while test $# -gt 0; do
case $1 in
-p|--profile) shift; profile=$1;;
-r|--repo) shift; repo=$1;;
+ -v|-vv) opt=$1;;
--help) echo "ustl. sorry."; exit 0;;
--version) echo "$vc_id"; exit 0;;
*) echo "$0: unrecognized option \`$1'." >&2