diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 14 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index 60138d7eb93..94188f5c0fa 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -168,16 +168,20 @@ sub install_package { # we install split containers under the following conditions: # - the container were split generated # - src/doc files should be installed - # - the package is not already a split one (like .i386-linux) + # (- the package is not already a split one (like .i386-linux)) + # the above test has been removed because it would mean that + # texlive.infra.doc.tar.lzma + # will never be installed, and we do already check that there + # are at all src/doc files, which in split packages of the form + # foo.ARCH are not present. And if they are present, than that is fine, + # too (bin-foobar.win32.doc.tar.lzma) # - there are actually src/doc files present - if ($container_src_split && $opt_src && - ($pkg !~ m/\./) && $tlpobj->srcfiles) { + if ($container_src_split && $opt_src && $tlpobj->srcfiles) { my $srccontainer = $container; $srccontainer =~ s/(\.tar\.lzma|\.zip)$/.source$1/; $self->_install_package($srccontainer,\@installfiles,$totlpdb) || return(0); } - if ($container_doc_split && $real_opt_doc && - ($pkg !~ m/\./) && $tlpobj->docfiles) { + if ($container_doc_split && $real_opt_doc && $tlpobj->docfiles) { my $doccontainer = $container; $doccontainer =~ s/(\.tar\.lzma|\.zip)$/.doc$1/; $self->_install_package($doccontainer,\@installfiles,$totlpdb) || return(0); diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index a35fd51fbbc..61ca2d760e6 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -824,16 +824,18 @@ sub install_packages { # we install split containers under the following conditions: # - the container were split generated # - src/doc files should be installed - # - the package is not already a split one (like .i386-linux) + # (- the package is not already a split one (like .i386-linux)) + # the above test has been removed since that would mean that packages + # with a dot like texlive.infra will never have the docfiles installed + # that is already happening ...bummer. But since we already check + # whether there are src/docfiles present at all that is fine # - there are actually src/doc files present - if ($container_src_split && $opt_src && - ($package !~ m/\./) && $tlpobj->srcfiles) { + if ($container_src_split && $opt_src && $tlpobj->srcfiles) { my $srccontainer = $container; $srccontainer =~ s/(\.tar\.lzma|\.zip)$/.source$1/; install_package($srccontainer, $tlpobj->srccontainersize, $tlpobj->srccontainermd5, \@installfiles,$totlpdb->root,$vars{'this_platform'}); } - if ($container_doc_split && $real_opt_doc && - ($package !~ m/\./) && $tlpobj->docfiles) { + if ($container_doc_split && $real_opt_doc && $tlpobj->docfiles) { my $doccontainer = $container; $doccontainer =~ s/(\.tar\.lzma|\.zip)$/.doc$1/; install_package($doccontainer, $tlpobj->doccontainersize, $tlpobj->doccontainermd5, \@installfiles,$totlpdb->root,$vars{'this_platform'}); |