summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-27 01:44:13 +0000
committerKarl Berry <karl@freefriends.org>2008-11-27 01:44:13 +0000
commit1243221fe98ed105934b04e03e97e64f5b63cd41 (patch)
treee4b82d32efd8df702da27ca87e4ed6a191c44890
parentb7f87ce90580cf7f437c793c5f99c5f3ea93490f (diff)
slightly shorten install message.
git-svn-id: svn://tug.org/texlive/trunk@11435 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm22
1 files changed, 15 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 30408613ea2..fe6d6055917 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -858,7 +858,9 @@ sub install_packages {
# here we could add more information, eg about timing and number
# of bytes etc etc.
# the size of the containers is present
- my $infostr = sprintf("Installing [%0${td}d/$totalnr, est. time remain/total: $remtime/$tottime]: $package [%dkb]",$n, int($tlpsizes{$package}/1024));
+ my $infostr = sprintf("Installing [%0${td}d/$totalnr, "
+ . "time remain/total: $remtime/$tottime]: $package [%db]",
+ $n, int($tlpsizes{$package}/1024));
info("$infostr\n");
foreach my $h (@::install_packages_hook) {
&$h($n,$totalnr);
@@ -884,13 +886,14 @@ sub install_packages {
} elsif (-r "$root/$Archive/$package.tar.lzma") {
$container = "$root/$Archive/$package.tar.lzma";
} else {
- tlwarn("Cannot find a package $package (.zip or .lzma) in $root/$Archive\n");
+ tlwarn("No package $package (.zip or .lzma) in $root/$Archive\n");
next;
}
} elsif ($media eq 'NET') {
$container = "$root/$Archive/$package.$DefaultContainerExtension";
}
- install_package($container, $tlpobj->containersize, $tlpobj->containermd5, \@installfiles,$totlpdb->root,$vars{'this_platform'});
+ install_package($container, $tlpobj->containersize, $tlpobj->containermd5,
+ \@installfiles, $totlpdb->root, $vars{'this_platform'});
# if we are installing from CD or NET we have to fetch the respective
# source and doc packages $pkg.source and $pkg.doc and install them, too
if (($media eq 'NET') || ($media eq 'CD')) {
@@ -906,12 +909,17 @@ sub install_packages {
if ($container_src_split && $opt_src && $tlpobj->srcfiles) {
my $srccontainer = $container;
$srccontainer =~ s/(\.tar\.lzma|\.zip)$/.source$1/;
- install_package($srccontainer, $tlpobj->srccontainersize, $tlpobj->srccontainermd5, \@installfiles,$totlpdb->root,$vars{'this_platform'});
+ install_package($srccontainer, $tlpobj->srccontainersize,
+ $tlpobj->srccontainermd5, \@installfiles,
+ $totlpdb->root, $vars{'this_platform'});
}
if ($container_doc_split && $real_opt_doc && $tlpobj->docfiles) {
my $doccontainer = $container;
$doccontainer =~ s/(\.tar\.lzma|\.zip)$/.doc$1/;
- install_package($doccontainer, $tlpobj->doccontainersize, $tlpobj->doccontainermd5, \@installfiles,$totlpdb->root,$vars{'this_platform'});
+ install_package($doccontainer,
+ $tlpobj->doccontainersize,
+ $tlpobj->doccontainermd5, \@installfiles,
+ $totlpdb->root, $vars{'this_platform'});
}
}
# we don't want to have wrong information in the tlpdb, so remove the
@@ -927,8 +935,8 @@ sub install_packages {
# archives (.tar.lzma) but at DVD install time we don't have them
my $tlpod = $totlpdb->root . "/tlpkg/tlpobj";
mkdirhier( $tlpod );
- open(TMP,">$tlpod/".$tlpobj->name.".tlpobj") or
- die("Cannot open tlpobj file for ".$tlpobj->name);
+ open(TMP,">$tlpod/".$tlpobj->name.".tlpobj") ||
+ die "$0: open tlpobj " . $tlpobj->name . "failed: $!";
$tlpobj->writeout(\*TMP);
close(TMP);
$donesize += $tlpsizes{$package};