diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-08-27 16:27:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-08-27 16:27:57 -0400 |
| commit | 0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80 (patch) | |
| tree | b9b60d267a5964c2de1a8d35b1b89f7c24feb787 | |
| parent | 18e4fa65399f2a21bd943b0e62b81a100f941d44 (diff) | |
| download | ikiwiki-0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80.tar ikiwiki-0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80.tar.gz | |
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.
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 2 insertions, 3 deletions
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) |