From: Joey Hess Date: Sun, 27 Jul 2008 05:52:36 +0000 (-0400) Subject: checkconfig before wrapper setup X-Git-Tag: 2.60~160 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6040886c725c6b6a179bf164a34be20dd161f1e2 checkconfig before wrapper setup Necessary now that the plugins control what wrappers are built. --- diff --git a/ikiwiki.in b/ikiwiki.in index 0390df7e1..d8e848f87 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -116,6 +116,10 @@ sub main () { #{{{ if ($config{setup}) { require IkiWiki::Setup; IkiWiki::Setup::load($config{setup}); + + loadplugins(); + checkconfig(); + if (@{$config{wrappers}} && ! $config{render} && ! $config{dumpsetup} && (! $config{refresh} || $config{genwrappers})) { @@ -148,9 +152,6 @@ sub main () { #{{{ # ignore syslog setting from setup file # while doing initial setup $config{syslog}=0 unless $config{dumpsetup}; - - loadplugins(); - checkconfig(); } if ($config{dumpsetup}) {