aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-26 13:24:51 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-26 13:24:51 -0400
commit4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32 (patch)
tree0580c3c19cba8868d093ae927a673a27f6f09f2a
parent2736fc5ba975a92311649b5951c677223732d531 (diff)
downloadikiwiki-4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32.tar
ikiwiki-4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32.tar.gz
htmltidy: Print a warning message if tidy fails. Closes: #543722
-rw-r--r--IkiWiki/Plugin/htmltidy.pm5
-rw-r--r--debian/changelog1
2 files changed, 5 insertions, 1 deletions
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