reset setuptype first, actually

so setup file can override default

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9f694e18ed739c9bcd0d245cad6986b136535d0b..e9a572450d07d3cf885355992c26ea9a5950ada4 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,8 +38,8 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
        my $this=shift;
 
 sub import (@) {
        my $this=shift;

-       IkiWiki::Setup::merge({@_});

        $config{setuptype}='Standard';
        $config{setuptype}='Standard';

+       IkiWiki::Setup::merge({@_});

 
        if (! $config{force_overwrite}) {
                # Avoid overwriting any existing files.
 
        if (! $config{force_overwrite}) {
                # Avoid overwriting any existing files.

diff --git a/debian/changelog b/debian/changelog
index e020b380f8cb4f603c2ac14863151014cf5d4da6..4d0639a5815beeae5bad092c2f4e1ea410405e94 100644 (file)
--- 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.
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.