websetup: Display stderr in browser if ikiwiki setup fails.

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 95d044c08a5d46ada18308d6448efebede1732af..92e6875ba08036aaedf53b0ac186de40985bdca4 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -426,8 +426,10 @@ sub showform ($$) {
                                        "-refresh", "-wrappers", "-v");
                        }
 
+                       close STDERR;
+                       open(STDERR, ">&STDOUT");
                        my $ret=system(@command);
-                       print "\n<pre>";
+                       print "\n<\/pre>";
                        if ($ret != 0) {
                                print '<p class="error">'.
                                        sprintf(gettext("<p class=\"error\">Error: %s exited nonzero (%s)"),

diff --git a/debian/changelog b/debian/changelog
index 3a6e490a47294c98c58d52457112881e60b74507..533a2a16f0af7be62c4df9ffb1049cd12a100470 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.11) UNRELEASED; urgency=low
 
   * Add python:Depends to control file. Closes: #525086
+  * websetup: Display stderr in browser if ikiwiki setup fails.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 21 Apr 2009 21:41:38 -0400