From 06709cdf314ed12da5e29658231636372c34da8f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 9 Jul 2008 16:53:03 -0400
Subject: improve error message if virus checker fails w/o output
---
IkiWiki/Plugin/attachment.pm | 3 +++
debian/changelog | 4 ++--
po/ikiwiki.pot | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ef6d79a9c..01d0d2478 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -386,6 +386,9 @@ sub match_virusfree ($$;@) { #{{{
waitpid $pid, 0;
$SIG{PIPE}="DEFAULT";
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)");
}
else {
diff --git a/debian/changelog b/debian/changelog
index 31fccfc40..adfa2c2f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.53) UNRELEASED; urgency=low
+ikiwiki (2.53) unstable; urgency=low
* search: generate configuration files once only when rebuilding
(Gabriel McManus)
@@ -10,7 +10,7 @@ ikiwiki (2.53) UNRELEASED; urgency=low
* attachment: Support perl 5.8's buggy version of CGI.pm.
* 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
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index dd0bcb973..f29e14d7f 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
--
cgit v1.2.3