]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
websetup: If setup fails, restore old setup file.
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Apr 2009 18:05:37 +0000 (14:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Apr 2009 18:05:37 +0000 (14:05 -0400)
IkiWiki/Plugin/websetup.pm
debian/changelog

index 92e6875ba08036aaedf53b0ac186de40985bdca4..9edd22d2625ddf474fc419d84b6bc544ba6c3270 100644 (file)
@@ -403,6 +403,7 @@ sub showform ($$) {
                        $form->reset(0); # doesn't really make sense here
                }
                else {
                        $form->reset(0); # doesn't really make sense here
                }
                else {
+                       my $oldsetup=readfile($config{setupfile});
                        IkiWiki::Setup::dump($config{setupfile});
 
                        IkiWiki::saveindex();
                        IkiWiki::Setup::dump($config{setupfile});
 
                        IkiWiki::saveindex();
@@ -432,12 +433,15 @@ sub showform ($$) {
                        print "\n<\/pre>";
                        if ($ret != 0) {
                                print '<p class="error">'.
                        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>';
                                                join(" ", @command), $ret).
                                        '</p>';
+                               open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
+                               print OUT $oldsetup;
+                               close OUT;
                        }
 
                        }
 
-                       print $tail;                    
+                       print $tail;
                        exit 0;
                }
        }
                        exit 0;
                }
        }
index 011f4b669a21c5ba3771954b2e6a572ae7f4f353..ba3042af00878e2f2ff1d9653a40a6f5127f55cb 100644 (file)
@@ -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
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 21 Apr 2009 21:41:38 -0400