summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
diff options
context:
space:
mode:
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm31
1 files changed, 20 insertions, 11 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
index 49125acb8b..93e20de18f 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
@@ -1,4 +1,4 @@
-# $Id: TLPDB.pm 52167 2019-09-24 16:02:28Z karl $
+# $Id: TLPDB.pm 52706 2019-11-09 17:42:02Z karl $
# TeXLive::TLPDB.pm - tlpdb plain text database files.
# Copyright 2007-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLPDB;
-my $svnrev = '$Revision: 52167 $';
+my $svnrev = '$Revision: 52706 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -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);
}
#