From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 18:59:21 +0000 (-0400)
Subject: reset setuptype first, actually
X-Git-Tag: 3.20100403~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=440e18bc15389780833fc8b9c04116a97eeaeaa2;p=ikiwiki.git

reset setuptype first, actually

so setup file can override default
---

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9f694e18e..e9a572450 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,8 +38,8 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
 	my $this=shift;
-	IkiWiki::Setup::merge({@_});
 	$config{setuptype}='Standard';
+	IkiWiki::Setup::merge({@_});
 
 	if (! $config{force_overwrite}) {
 		# Avoid overwriting any existing files.
diff --git a/debian/changelog b/debian/changelog
index e020b380f..4d0639a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100313) UNRELEASED; urgency=low
+ikiwiki (3.20100320) UNRELEASED; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.