From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 20:27:57 +0000 (-0400)
Subject: htmltidy: Return an error message if tidy fails. Closes: #543722
X-Git-Tag: 3.1415926~40
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80

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 fc0d3b1d6..e6d377f8a 100644
--- 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 b4169c576..8cd5032cd 100644
--- 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)