texlive[47809] Master: fixes for warning messages and undefined vars

commits+preining at tug.org commits+preining at tug.org
Wed May 23 04:33:42 CEST 2018


Revision: 47809
          http://tug.org/svn/texlive?view=revision&revision=47809
Author:   preining
Date:     2018-05-23 04:33:42 +0200 (Wed, 23 May 2018)
Log Message:
-----------
fixes for warning messages and undefined vars

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLPDB.pm

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2018-05-23 02:33:32 UTC (rev 47808)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2018-05-23 02:33:42 UTC (rev 47809)
@@ -2827,7 +2827,7 @@
       $mediatlp = $remotetlpdb->get_package($pkg);
     }
     if (!defined($mediatlp)) {
-      debug("$pkg cannot be found in $location\n");
+      ddebug("$pkg cannot be found in $location\n");
       next;
     }
     my $rctanvers = $mediatlp->cataloguedata->{'version'};

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:33:32 UTC (rev 47808)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:33:42 UTC (rev 47809)
@@ -321,6 +321,7 @@
     $tlpdbfile_quote = "\"$tlpdbfile\"";
     # if we have xz available we try the xz file
     my $xz_succeeded = 0 ;
+    my $compressorextension = "<UNSET>";
     if (defined($::progs{$DefaultCompressorFormat})) {
       # we first try the xz compressed file
       my ($xzfh, $xzfile) = TeXLive::TLUtils::tl_tmpfile();
@@ -331,7 +332,7 @@
       }
       $xzfile_quote = "\"$xzfile\"";
       my $decompressor = TeXLive::TLUtils::quotify_path_with_spaces($::progs{$DecompressorProgram{$DefaultCompressorFormat}});
-      my $compressorextension = $CompressorExtension{$DefaultCompressorFormat};
+      $compressorextension = $CompressorExtension{$DefaultCompressorFormat};
       my @decompressorArgs = @{$DecompressorArgs{$DefaultCompressorFormat}};
       debug("trying to download $path.$compressorextension to $xzfile\n");
       my $ret = TeXLive::TLUtils::download_file("$path.$compressorextension", "$xzfile");
@@ -353,7 +354,7 @@
         }
       } 
     } else {
-      debug("no $DefaultCompressorFormat defined, not trying tlpdb.$compressorextension ...\n");
+      debug("no $DefaultCompressorFormat defined ...\n");
     }
     if (!$xz_succeeded) {
       debug("TLPDB: downloading $path.$compressorextension didn't succeed, try $path\n");
@@ -883,7 +884,7 @@
       next if ($p =~ m/^00texlive/);
       my $pkg = $self->get_package($p, ($install{$p}?$install{$p}:undef));
       if (!defined($pkg)) {
-        debug("W: $p is mentioned somewhere but not available, disabling\n");
+        ddebug("W: $p is mentioned somewhere but not available, disabling\n");
         $install{$p} = 0;
         next;
       }



More information about the tex-live-commits mailing list