diff options
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 92e6875ba..9edd22d26 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -403,6 +403,7 @@ sub showform ($$) { $form->reset(0); # doesn't really make sense here } else { + my $oldsetup=readfile($config{setupfile}); IkiWiki::Setup::dump($config{setupfile}); IkiWiki::saveindex(); @@ -432,12 +433,15 @@ sub showform ($$) { print "\n<\/pre>"; if ($ret != 0) { print '<p class="error">'. - sprintf(gettext("<p class=\"error\">Error: %s exited nonzero (%s)"), + sprintf(gettext("Error: %s exited nonzero (%s). Discarding setup changes."), join(" ", @command), $ret). '</p>'; + open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!"); + print OUT $oldsetup; + close OUT; } - print $tail; + print $tail; exit 0; } } diff --git a/debian/changelog b/debian/changelog index 011f4b669..ba3042af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.11) UNRELEASED; urgency=low error can be printed at that point if it's not available, allowing the admin to see it during wiki setup. Closes: #520015 + * websetup: If setup fails, restore old setup file. -- Joey Hess <joeyh@debian.org> Tue, 21 Apr 2009 21:41:38 -0400 |