summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-22 14:05:37 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-22 14:05:37 -0400
commit565e5291cd037c155e976b69f7b8d26c5b64a389 (patch)
tree9e23dec3157801f13fa8f3e3342bbf485ac1baf8
parent30308664a698102bdb15995d9d0d65e213c49964 (diff)
websetup: If setup fails, restore old setup file.
-rw-r--r--IkiWiki/Plugin/websetup.pm8
-rw-r--r--debian/changelog1
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