From 565e5291cd037c155e976b69f7b8d26c5b64a389 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Apr 2009 14:05:37 -0400
Subject: websetup: If setup fails, restore old setup file.

---
 IkiWiki/Plugin/websetup.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

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;
 		}
 	}
-- 
cgit v1.2.3