From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Apr 2009 17:31:56 +0000 (-0400)
Subject: websetup: Display stderr in browser if ikiwiki setup fails.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4fbe1c3d447d875562b6c6a43ac702101eae3953

websetup: Display stderr in browser if ikiwiki setup fails.
---

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 95d044c08..92e6875ba 100644
--- 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 3a6e490a4..533a2a16f 100644
--- 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