From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 17:24:51 +0000 (-0400)
Subject: htmltidy: Print a warning message if tidy fails. Closes: #543722
X-Git-Tag: 3.1415926~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32;p=ikiwiki.git

htmltidy: Print a warning message if tidy fails. Closes: #543722
---

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6f3379ef4..fc0d3b1d6 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -46,7 +46,10 @@ sub sanitize (@) {
 	waitpid $pid, 0;
 
 	$SIG{PIPE}="DEFAULT";
-	return "" if $sigpipe || ! defined $ret;
+	if ($sigpipe || ! defined $ret) {
+		print STDERR gettext("warning: tidy failed")."\n";
+		return "";
+	}
 
 	return $ret;
 }
diff --git a/debian/changelog b/debian/changelog
index 0d3f61e6f..69e197e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +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
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400