summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-12 19:37:52 +0000
committerKarl Berry <karl@freefriends.org>2008-11-12 19:37:52 +0000
commit3fa9935e8c9a7f5581c96c6c8f7f85f07e743617 (patch)
tree3dbe1e9fbb94b33159130202fb7eb1a87a87c82b /Master
parente98f1b9b9b8abd945ca55c557a06e5e298642f25 (diff)
fewer bangs in messages
git-svn-id: svn://tug.org/texlive/trunk@11271 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm33
1 files changed, 19 insertions, 14 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index a7dee935047..1c2259c8827 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -960,15 +960,17 @@ sub install_package {
if (tlmd5($lzmafile) eq $whatmd5) {
$gotfiledone = 1;
} else {
- tlwarn("Downloaded file present, size equal, but md5sum differs\nredownloading $what!\n");
+ tlwarn("Downloaded $what, size equal, but md5sum differs;\n",
+ "downloading again.\n");
}
} else {
# size ok, no md5sum
- tlwarn("Downloaded container present, size equal, but no md5sum available. Hope that is fine!\n");
+ tlwarn("Downloaded $what, size equal, but no md5sum available;\n",
+ "continuing, with fingers crossed.");
$gotfiledone = 1;
}
} else {
- tlwarn("Partial download of $what found, removing it!\n");
+ tlwarn("Partial download of $what found, removing it.\n");
unlink($tarfile, $lzmafile);
}
} else {
@@ -977,10 +979,11 @@ sub install_package {
if (tlmd5($lzmafile) eq $whatmd5) {
$gotfiledone = 1;
} else {
- tlwarn("Downloaded file present, but md5sum differs, removing it!\n");
+ tlwarn("Downloaded file, but md5sum differs, removing it.\n");
}
} else {
- tlwarn("container found, but we cannot verify size of md5sum!\nContinuing with it and hope that it is ok!\n");
+ tlwarn("Container found, but cannot verify size of md5sum;\n",
+ "continuing, with fingers crossed.\n");
$gotfiledone = 1;
}
}
@@ -992,17 +995,18 @@ sub install_package {
# we are installing from the NET
# download the file and put it into temp
if (!download_file($what, $lzmafile) || (! -r $lzmafile)) {
- &main::create_profile("./installation.profile");
- tlwarn("Downloading $what did not succeed!\n");
- tlwarn("Please retry the install process.\n");
- tlwarn("Starting the installer will try to restart the installation!\n");
- tlwarn("If that doesn't work you can restart by running the installer with\n");
+ my $profile_name = "installation.profile";
+ &main::create_profile($profile_name);
+ tlwarn("Downloading $what did not succeed.\n");
+ tlwarn("Rerunning the installer will try to ",
+ "restart the installation.\n");
+ tlwarn("Or you can restart by running the installer with:\n");
if (win32()) {
- tlwarn(" install-tl.bat --profile texlive.profile [other args]\n");
+ tlwarn(" install-tl.bat --profile $profile_name [EXTRA-ARGS]\n");
} else {
- tlwarn(" install-tl --profile texlive.profile [other args]\n");
+ tlwarn(" install-tl --profile $profile_name [EXTRA-ARGS]\n");
}
- die "Downloading $what did not succeed!\n";
+ die "\n";
}
} else {
# we are installing from CD
@@ -1477,7 +1481,8 @@ sub texdir_check {
}
-
+# no newlines are added, multiple args are just concatenated.
+#
sub logit {
my ($out, $level, @rest) = @_;
_logit($out, $level, @rest) unless $::opt_quiet;