improve error message if virus checker fails w/o output

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ef6d79a9c52a1db7006d223730a1636c6ab71bf6..01d0d24784316b7302beee90f5df4d9580a5575d 100644 (file)
--- 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 || $?) {
        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 {
                return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
        }
        else {

diff --git a/debian/changelog b/debian/changelog
index 31fccfc40117a26028fd78acfcb5670051551b36..adfa2c2f09eb6d41b475782b5ef169d618a2d197 100644 (file)
--- 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)
 
   * 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ş)
 
   * 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
 
 
 ikiwiki (2.52) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index dd0bcb9734e8073771eff2f131a61ab4b8b7d17d..f29e14d7f6a028e5c625d666f7643a1d2e5016fc 100644 (file)
--- 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"
 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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"