Add force_overwrite setting to make setup automator overwrite existing files/directories.

This can be useful if you're driving the setup automator from another
program.

IkiWiki/Setup/Automator.pm

@@ -40,6 +40,7 @@ sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
 
+	if (! $config{force_overwrite}) {
 		# Avoid overwriting any existing files.
 		foreach my $key (qw{srcdir destdir repository dumpsetup}) {
 			next unless exists $config{$key};
@@ -52,6 +53,7 @@ sub import (@) {
 			}
 			$config{$key}=$dir.$add.$base;
 		}
+	}
 	
 	# Set up wrapper
 	if ($config{rcs}) {

debian/changelog

@@ -4,6 +4,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to get the comment counts
     added to existing pages.
   * Loosen regexp, to allow empty quoted parameters in directives.
+  * Add force_overwrite setting to make setup automator overwrite existing
+    files/directories.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500