summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLMedia.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/TeXLive/TLMedia.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index f1eb9062e45..4b83b2db674 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -10,7 +10,7 @@ package TeXLive::TLMedia;
use TeXLive::TLConfig;
use TeXLive::TLPostActions;
-use TeXLive::TLUtils qw(tllog copy win32 dirname mkdirhier conv_to_win_path basename download_file merge_into);
+use TeXLive::TLUtils qw(copy win32 dirname mkdirhier conv_to_win_path basename download_file merge_into);
use TeXLive::TLPDB;
use Cwd qw/abs_path/;
@@ -38,7 +38,7 @@ sub new
return;
}
}
- tllog($::LOG_DEBUG, "Loading $location/$InfraLocation/$DatabaseName ...\n");
+ debug("Loading $location/$InfraLocation/$DatabaseName ...\n");
my $tlpdb = TeXLive::TLPDB->new(root => "$location");
my (@all_c, @std_c, @lang_c, @lang_doc_c);
my (@schemes);
@@ -90,14 +90,14 @@ sub install_package {
if (!defined($tlpobj)) {
if (defined($fallbackmedia)) {
if ($ret = $fallbackmedia->install_package($pkg,$totlpdb)) {
- tllog($::LOG_DEBUG, "installed $pkg from fallback");
+ debug("installed $pkg from fallback");
return $ret;
} else {
- tllog($::LOG_NORMAL, "couldn't find $pkg");
+ tlwarn("couldn't find $pkg");
return 0;
}
} else {
- tllog($::LOG_NORMAL, "couldn't find $pkg");
+ tlwarn("couldn't find $pkg");
return 0;
}
} else {
@@ -112,7 +112,7 @@ sub install_package {
# even if opt_doc is false
$real_opt_doc = 1;
}
- tllog($::LOG_NORMAL, "install: $pkg\n");
+ info("install: $pkg\n");
foreach my $h (@::install_packages_hook) {
&$h("install: $package");
}
@@ -149,7 +149,7 @@ sub install_package {
$container = "$location/$DiskArchive/$pkg.tar.lzma";
} else {
# for now only warn and return, should (?) be die!?
- warn "Cannot find a package $pkg (.zip or .lzma) in $location/$DiskArchive\n";
+ tlwarn "Cannot find a package $pkg (.zip or .lzma) in $location/$DiskArchive\n";
next;
}
} elsif (&media eq 'NET') {
@@ -229,7 +229,7 @@ sub install_package {
if (!$nopostinstall) {
# do the postinstallation actions
if (defined($PostInstall{$pkg})) {
- tllog($::LOG_NORMAL, "running post install action for $pkg\n");
+ info("running post install action for $pkg\n");
&{$PostInstall{$pkg}}($totlpdb->root);
}
}
@@ -295,12 +295,12 @@ sub _install_package {
# copy it to temp
copy($what, "$target/temp");
}
- tllog($::LOG_DEBUG, "Un-lzmaing $lzmafile to $tarfile\n");
+ debug("Un-lzmaing $lzmafile to $tarfile\n");
system("$lzmadec < $lzmafile_quote > $tarfile_quote");
if (! -f $tarfile) {
die "Unpacking $lzmafile did not succeed, please retry!";
}
- tllog($::LOG_DEBUG, "Unpacking $tarfile\n");
+ debug("Unpacking $tarfile\n");
system($tar,"-x","-C",$target,"-f",$tarfile);
unlink($tarfile, $lzmafile);
} else {