From 440e18bc15389780833fc8b9c04116a97eeaeaa2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 14:59:21 -0400
Subject: [PATCH] reset setuptype first, actually
so setup file can override default
---
IkiWiki/Setup/Automator.pm | 2 +-
debian/changelog | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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.
--
2.39.5