diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPOBJ.pm')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index e0e5db16dfe..e93afc42fe3 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -559,9 +559,12 @@ sub common_texmf_tree { sub make_container { my ($self,$type,$instroot,$destdir,$containername,$relative) = @_; - if (!TeXLive::TLUtils::member($type, @AcceptedCompressors)) { - die "$0: TLPOBJ supports @AcceptedCompressors containers, not $type"; + if (!TeXLive::TLUtils::member($type, @{$::progs{'working_compressors'}})) { + tlwarn "$0: TLPOBJ supports @{$::progs{'working_compressors'}} containers, not $type\n"; + tlwarn "$0: falling back to $DefaultCompressorFormat as container type!\n"; + $type = $DefaultCompressorFormat; } + if (!defined($containername)) { $containername = $self->name; } @@ -631,13 +634,6 @@ sub make_container { $tar = "tar"; } - # determine compressor: - # * first try the one passed in as requested - # * if that one is not available, fall back to xz - if ($type ne "xz" && !defined($::progs{$CompressorProgram{$type}})) { - debug("$0: compressor of type $type not available, falling back to xz\n"); - $type = "xz"; - } my $compressor = $::progs{$CompressorProgram{$type}}; my @compressorargs = @{$CompressorArgs{$type}}; my $compressorextension = $CompressorExtension{$type}; @@ -730,7 +726,7 @@ sub make_container { if (-r "$destdir/$tarname") { system($compressor, @compressorargs, "$destdir/$tarname"); } else { - tlwarn("$0: Couldn't find $destdir/$tarname to run $xz\n"); + tlwarn("$0: Couldn't find $destdir/$tarname to run $compressor\n"); return (0, 0, ""); } |