texlive[47934] Master/tlpkg/TeXLive: TLConfig.pm

commits+karl at tug.org commits+karl at tug.org
Wed Jun 6 00:35:41 CEST 2018


Revision: 47934
          http://tug.org/svn/texlive?view=revision&revision=47934
Author:   karl
Date:     2018-06-06 00:35:41 +0200 (Wed, 06 Jun 2018)
Log Message:
-----------
TLConfig.pm (AcceptedCompressors): move lz4 to end, it's writing
to stdout (sometimes?).
TLPOBJ.pm (make_container): compute other compressor values after
possible fallback.

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLConfig.pm
    trunk/Master/tlpkg/TeXLive/TLPOBJ.pm

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2018-06-05 21:59:23 UTC (rev 47933)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2018-06-05 22:35:41 UTC (rev 47934)
@@ -131,7 +131,7 @@
 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');

Modified: trunk/Master/tlpkg/TeXLive/TLPOBJ.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPOBJ.pm	2018-06-05 21:59:23 UTC (rev 47933)
+++ trunk/Master/tlpkg/TeXLive/TLPOBJ.pm	2018-06-05 22:35:41 UTC (rev 47934)
@@ -719,15 +719,16 @@
   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") {



More information about the tex-live-commits mailing list