summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-12 06:08:00 +0000
committerNorbert Preining <preining@logic.at>2016-04-12 06:08:00 +0000
commit18e3c92a22f8efe6795b2543fed0758284f1c311 (patch)
tree8381aecd176c326b7d6aad4d21e745d395efc27b
parentd473704fbfda13f0731dd1feeb08c68c16874dd2 (diff)
allow for non-failing setup_unix_one
git-svn-id: svn://tug.org/texlive/trunk@40431 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 6274e0b20aa..6fafd4e5806 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2243,7 +2243,7 @@ sub setup_programs {
# Return 0 if failure, 1 if success.
#
sub setup_unix_one {
- my ($p, $def, $arg) = @_;
+ my ($p, $def, $arg, $donotwarn) = @_;
our $tmp;
my $test_fallback = 0;
if (-r $def) {
@@ -2317,9 +2317,13 @@ sub setup_unix_one {
if ($ret == 0) {
debug("Using system $p (tested).\n");
} else {
- tlwarn("$0: Initialization failed (in setup_unix_one):\n");
- tlwarn("$0: could not find a usable $p.\n");
- tlwarn("$0: Please install $p and try again.\n");
+ if ($donotwarn) {
+ tldebug("$0: initialization of $p failed but ignored!\n");
+ } else {
+ tlwarn("$0: Initialization failed (in setup_unix_one):\n");
+ tlwarn("$0: could not find a usable $p.\n");
+ tlwarn("$0: Please install $p and try again.\n");
+ }
return 0;
}
} else {