htmltidy: Return an error message if tidy fails. Closes: #543722

On second^Wthird^Wfourth thought, putting the message into the page seems
better than using stderr.

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index fc0d3b1d68067593851f3da8203ccdfcd87e344e..e6d377f8ab96a853f0bfcbc51ab2d09126e6d14e 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -47,8 +47,7 @@ sub sanitize (@) {
 
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe || ! defined $ret) {
-               print STDERR gettext("warning: tidy failed")."\n";
-               return "";
+               return gettext("htmltidy failed to parse this html");
        }
 
        return $ret;

diff --git a/debian/changelog b/debian/changelog
index b4169c576f3f4d00cb2fa76a58153a34d929b0f3..8cd5032cde7b6775b69a5f679881a291c1fe1e10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
-  * htmltidy: Print a warning message if tidy fails. Closes: #543722
+  * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)