From 74ed76f3faa97cee22dc1328e6c6a7ee54acf51c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Jun 2018 22:35:41 +0000 Subject: TLConfig.pm (AcceptedCompressors): move lz4 to end, it's writing to stdout (sometimes?). TLPOBJ.pm (make_container): compute other compressor values after possible fallback. git-svn-id: svn://tug.org/texlive/trunk@47934 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLConfig.pm | 2 +- Master/tlpkg/TeXLive/TLPOBJ.pm | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index c60396a3aca..0328d51d2b1 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -131,7 +131,7 @@ our %FallbackDownloaderArgs = ( our $DefaultCompressorFormat = "xz"; our $DefaultContainerExtension = "tar.$DefaultCompressorFormat"; # mind that the order here is important as gives also the preference! -our @AcceptedCompressors = qw/lz4 gzip xz/; +our @AcceptedCompressors = qw/xz gzip lz4/; our $AcceptedCompressorsRegexp = "(xz|lz4|gzip)"; our %CompressorProgram = ( 'xz' => 'xz', 'gzip' => 'gzip', 'lz4' => 'lz4'); our %CompressorExtension = ( 'xz' => 'xz', 'gzip' => 'gz', 'lz4' => 'lz4'); diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 72a72b95feb..a0f3f10d675 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -719,15 +719,16 @@ sub make_container { if ($type ne 'tar') { # compress it my $compressor = $::progs{$CompressorProgram{$type}}; - my @compressorargs = @{$CompressorArgs{$type}}; - my $compressorextension = $CompressorExtension{$type}; - $containername = "$tarname.$compressorextension"; - debug("selected compressor: $compressor with @compressorargs\n"); if (!defined($compressor)) { # fall back to $type as compressor, but that shouldn't happen tlwarn("$0: programs not set up, trying \"$type\".\n"); $compressor = $type; } + my @compressorargs = @{$CompressorArgs{$type}}; + my $compressorextension = $CompressorExtension{$type}; + $containername = "$tarname.$compressorextension"; + debug("selected compressor: $compressor with @compressorargs, " + . "on $destdir/$tarname\n"); # compress it. if (-r "$destdir/$tarname") { -- cgit v1.2.3