diff options
| author | Norbert Preining <preining@logic.at> | 2018-05-23 02:33:42 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2018-05-23 02:33:42 +0000 |
| commit | 1ce02f9a0fcea5918876f7131c2ac61b8e410021 (patch) | |
| tree | e11e6012ef396b91f718729778c5bac4e6793906 /Master | |
| parent | f4fad89bb1e902329ae4913c971a4b35f89ecdc3 (diff) | |
fixes for warning messages and undefined vars
git-svn-id: svn://tug.org/texlive/trunk@47809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 2 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 906faff441f..7431ebcb69c 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -2827,7 +2827,7 @@ sub action_update { $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'}; diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index aeeae5577d3..ea153fcf484 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -321,6 +321,7 @@ sub from_file { $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 @@ sub from_file { } $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 @@ sub from_file { } } } 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 @@ sub expand_dependencies { 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; } |