summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-09 17:42:02 +0000
committerKarl Berry <karl@freefriends.org>2019-11-09 17:42:02 +0000
commit24bb9e4fa5f638d0e535c4cdd8a87ea482b11490 (patch)
treec9a56adc5e720e310f37075914d9221c29a8f772 /Master/tlpkg/TeXLive
parent4885bb094e49e56658e15217cf9e143b0f6d14b3 (diff)
TLUtils.pm (setup_programs): only use Data::Dumper if vv, not just v;
indent debug output lines. (copy): ddebug of every copy is too much; but ddebug dereferencing. TLPDB.pm (not_virtual_install_package): show container files instead of meaningless array ref hex, and only if ddebug. tl-try-install: placeholder for install-tl options. tl-try-makeself: doc. tl-update-nsis: remove tlpobj/ dir if we created it. tl-update-tlcritical: new option --no-containers. tltestnet: new convenience script for testing versioned containers. git-svn-id: svn://tug.org/texlive/trunk@52706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm27
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm19
2 files changed, 28 insertions, 18 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 70a1deaa2f4..865e3c67ac4 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1825,17 +1825,24 @@ sub not_virtual_install_package {
}
}
if (!$container) {
- tlwarn("TLPDB: cannot find package $pkg.tar.$CompressorExtRegexp in $root/$Archive\n");
+ tlwarn("TLPDB: cannot find package $pkg.tar.$CompressorExtRegexp"
+ . " in $root/$Archive\n");
return(0);
}
} elsif (&media eq 'NET') {
- $container = "$root/$Archive/$pkg.tar." . $Compressors{$DefaultCompressorFormat}{'extension'};
- }
- debug("TLPDB::not_virtual_install_package: trying to install $container\n");
- $self->_install_data ($container, $reloc, \@installfiles, $totlpdb, $tlpobj->containersize, $tlpobj->containerchecksum)
+ $container = "$root/$Archive/$pkg.tar."
+ . $Compressors{$DefaultCompressorFormat}{'extension'};
+ }
+ my $container_str = ref $container eq "ARRAY"
+ ? "[" . join (" ", @$container) . "]" : $container;
+ ddebug("TLPDB::not_virtual_install_package: installing container: ",
+ $container_str, "\n");
+ $self->_install_data($container, $reloc, \@installfiles, $totlpdb,
+ $tlpobj->containersize, $tlpobj->containerchecksum)
|| return(0);
- # if we are installing from local_compressed or NET we have to fetch the respective
- # source and doc packages $pkg.source and $pkg.doc and install them, too
+ # if we are installing from local_compressed or NET we have to fetch
+ # respective source and doc packages $pkg.source and $pkg.doc and
+ # install them, too
if (($media eq 'NET') || ($media eq 'local_compressed')) {
# we install split containers under the following conditions:
# - the container were split generated
@@ -1851,13 +1858,15 @@ sub not_virtual_install_package {
if ($container_src_split && $opt_src && $tlpobj->srcfiles) {
my $srccontainer = $container;
$srccontainer =~ s/\.tar\.$CompressorExtRegexp$/.source.tar.$1/;
- $self->_install_data ($srccontainer, $reloc, \@installfiles, $totlpdb, $tlpobj->srccontainersize, $tlpobj->srccontainerchecksum)
+ $self->_install_data($srccontainer, $reloc, \@installfiles, $totlpdb,
+ $tlpobj->srccontainersize, $tlpobj->srccontainerchecksum)
|| return(0);
}
if ($container_doc_split && $real_opt_doc && $tlpobj->docfiles) {
my $doccontainer = $container;
$doccontainer =~ s/\.tar\.$CompressorExtRegexp$/.doc.tar.$1/;
- $self->_install_data ($doccontainer, $reloc, \@installfiles, $totlpdb, $tlpobj->doccontainersize, $tlpobj->doccontainerchecksum)
+ $self->_install_data($doccontainer, $reloc, \@installfiles,
+ $totlpdb, $tlpobj->doccontainersize, $tlpobj->doccontainerchecksum)
|| return(0);
}
#
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index c8bb1256c9a..acdc9884f0b 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1130,7 +1130,7 @@ that is a fatal error.
=cut
sub copy {
- ddebug("TLUtils::copy(", join (",", @_), "\n");
+ #too verbose ddebug("TLUtils::copy(", join (",", @_), "\n");
my $infile = shift;
my $filemode = 0;
my $dereference = 0;
@@ -1182,12 +1182,13 @@ sub copy {
if ($linktarget !~ m,^/,) {
$infile = Cwd::abs_path(dirname($infile)) . "/$linktarget";
}
+ ddebug("TLUtils::copy: dereferencing symlink $infile -> $linktarget");
}
if (-l $infile) {
my $linktarget = readlink($infile);
my $dest = "$destdir/$filename";
- debug("TLUtils::copy: doing symlink($linktarget,$dest)"
+ ddebug("TLUtils::copy: doing symlink($linktarget,$dest)"
. " [from readlink($infile)]\n");
symlink($linktarget, $dest) || die "symlink($linktarget,$dest) failed: $!";
} else {
@@ -2523,7 +2524,7 @@ END_COMPRESSOR_BAD
$::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'};
}
- if ($::opt_verbosity >= 1) {
+ if ($::opt_verbosity >= 2) {
require Data::Dumper;
use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
$Data::Dumper::Purity); # -w pain
@@ -2604,16 +2605,16 @@ sub setup_unix_tl_one {
debug("(unix) trying to set up $p, default $def, arg $arg\n");
if (-r $def) {
if (-x $def) {
- ddebug("default $def has executable permissions\n");
+ ddebug(" Default $def has executable permissions\n");
# we have to check for actual "executability" since a "noexec"
# mount option may interfere, which is not taken into account by -x.
my $ret = system("'$def' $arg >/dev/null 2>&1" ); # we are on Unix
if ($ret == 0) {
$::progs{$p} = $def;
- debug("Using shipped $def for $p (tested).\n");
+ debug(" Using shipped $def for $p (tested).\n");
return(1);
} else {
- ddebug("Shipped $def has -x but cannot be executed, "
+ ddebug(" Shipped $def has -x but cannot be executed, "
. "trying tmp copy.\n");
}
}
@@ -2634,19 +2635,19 @@ sub setup_unix_tl_one {
if (! -x $tmpprog) {
# hmm, something is going really bad, not even the copy is
# executable. Fall back to normal path element
- ddebug("Copied $p $tmpprog does not have -x bit, strange!\n");
+ ddebug(" Copied $p $tmpprog does not have -x bit, strange!\n");
return(0);
} else {
# check again for executability
my $ret = system("$tmpprog $arg > /dev/null 2>&1");
if ($ret == 0) {
# ok, the copy works
- debug("Using copied $tmpprog for $p (tested).\n");
+ debug(" Using copied $tmpprog for $p (tested).\n");
$::progs{$p} = $tmpprog;
return(1);
} else {
# even the copied prog is not executable, strange
- ddebug("Copied $p $tmpprog has x bit but not executable?!\n");
+ ddebug(" Copied $p $tmpprog has x bit but not executable?!\n");
return(0);
}
}