From f0f17bdc41dd87d1ccf27aab79a0e78759d4a2eb Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 31 May 2018 16:50:47 +0000
Subject: xz -d some more; dump ::progs at ddebug levels

git-svn-id: svn://tug.org/texlive/trunk@47887 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/TeXLive/TLUtils.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Master/tlpkg/TeXLive/TLUtils.pm')

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index e11797195a8..46ac201c031 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2318,7 +2318,7 @@ sub read_file_ignore_cr {
 =item C<setup_programs($bindir, $platform)>
 
 Populate the global C<$::progs> hash containing the paths to the
-programs C<wget>, C<tar>, C<xz>. The C<$bindir> argument specifies
+programs C<lz4>, C<tar>, C<wget>, C<xz>. The C<$bindir> argument specifies
 the path to the location of the C<xz> binaries, the C<$platform>
 gives the TeX Live platform name, used as the extension on our
 executables.  If a program is not present in the TeX Live tree, we also
@@ -2411,13 +2411,14 @@ END_COMPRESSOR_BAD
     $::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'};
   }
 
-  if ($::opt_verbosity >= 1) {
+  if ($::opt_verbosity >= 2) {
     require Data::Dumper;
     use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
                 $Data::Dumper::Purity); # -w pain
     $Data::Dumper::Indent = 1;
     $Data::Dumper::Sortkeys = 1;  # stable output
     $Data::Dumper::Purity = 1; # recursive structures must be safe
+    print STDERR "DD:dumping ";
     print STDERR Data::Dumper->Dump([\%::progs], [qw(::progs)]);
   }
   return $ok;
@@ -2447,7 +2448,7 @@ sub setup_windows_one {
       system("$prog $arg");
     }
   } else {
-    debug("Default progrma $def not readable?\n");
+    debug("Default program $def not readable?\n");
   }
   return($ready) if ($ready);
   # still here, try plain name without any specification
@@ -2622,7 +2623,7 @@ sub download_file {
     } else {
       $downdest = $dest;
     }
-    # massage ssh:// into the scp acceptable scp://
+    # massage ssh:// into the scp-acceptable scp://
     $relpath =~ s!^ssh://!scp://!;
     my $retval = system("scp", "-q", $relpath, $downdest);
     if ($retval != 0) {
-- 
cgit v1.2.3