diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-09 17:42:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-09 17:42:02 +0000 |
commit | 24bb9e4fa5f638d0e535c4cdd8a87ea482b11490 (patch) | |
tree | c9a56adc5e720e310f37075914d9221c29a8f772 /Master/tlpkg/TeXLive/TLPDB.pm | |
parent | 4885bb094e49e56658e15217cf9e143b0f6d14b3 (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/TLPDB.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 27 |
1 files changed, 18 insertions, 9 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); } # |