improve error message if virus checker fails w/o output
parent
f39a3c1559
commit
06709cdf31
|
@ -386,6 +386,9 @@ sub match_virusfree ($$;@) { #{{{
|
||||||
waitpid $pid, 0;
|
waitpid $pid, 0;
|
||||||
$SIG{PIPE}="DEFAULT";
|
$SIG{PIPE}="DEFAULT";
|
||||||
if ($sigpipe || $?) {
|
if ($sigpipe || $?) {
|
||||||
|
if (! length $reason) {
|
||||||
|
$reason="virus checker $IkiWiki::config{virus_checker}; failed with no output";
|
||||||
|
}
|
||||||
return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
|
return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ikiwiki (2.53) UNRELEASED; urgency=low
|
ikiwiki (2.53) unstable; urgency=low
|
||||||
|
|
||||||
* search: generate configuration files once only when rebuilding
|
* search: generate configuration files once only when rebuilding
|
||||||
(Gabriel McManus)
|
(Gabriel McManus)
|
||||||
|
@ -10,7 +10,7 @@ ikiwiki (2.53) UNRELEASED; urgency=low
|
||||||
* attachment: Support perl 5.8's buggy version of CGI.pm.
|
* attachment: Support perl 5.8's buggy version of CGI.pm.
|
||||||
* otl: Support utf-8 files. (Recai Oktaş)
|
* otl: Support utf-8 files. (Recai Oktaş)
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Mon, 07 Jul 2008 01:52:48 -0400
|
-- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2008 16:45:33 -0400
|
||||||
|
|
||||||
ikiwiki (2.52) unstable; urgency=low
|
ikiwiki (2.52) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2008-07-08 18:14-0400\n"
|
"POT-Creation-Date: 2008-07-09 16:46-0400\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
Loading…
Reference in New Issue