From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 16:53:07 +0000 (-0400)
Subject: fixes
X-Git-Tag: 2.60~214
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=255172215e8d886ae875e79694bda1a656053410;p=ikiwiki.git

fixes
---

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index dcb278bf4..0e091b994 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,13 +7,12 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
 	$IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-package IkiWiki::Setup;
-
 sub dumpline ($$$) { #{{{
 	my $key=shift;
 	my $value=shift;
diff --git a/ikiwiki.in b/ikiwiki.in
index 0f82f77ac..8066bbc6e 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -149,9 +149,8 @@ sub main () { #{{{
 	}
 
 	if ($config{dumpsetup}) {
-		loadplugins();
-		checkconfig();
-		IkiWiki::Setup::dump($config{dumpsetup});
+		require IkiWiki::Setup::Standard;
+		IkiWiki::Setup::Standard::dump($config{dumpsetup});
 	}
 	elsif ($config{wrapper}) {
 		lockwiki();