websetup: Display stderr in browser if ikiwiki setup fails.

master
Joey Hess 2009-04-22 13:31:56 -04:00
parent e88ef0362c
commit 4fbe1c3d44
2 changed files with 4 additions and 1 deletions

View File

@ -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)"),

1
debian/changelog vendored
View File

@ -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