]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
checkconfig before wrapper setup
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 05:52:36 +0000 (01:52 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 05:52:36 +0000 (01:52 -0400)
Necessary now that the plugins control what wrappers are built.

ikiwiki.in

index 0390df7e1f64d4755620857aed20b7b8576dae4c..d8e848f8727c5dbfd11bc0f9ce976e0821b68cff 100755 (executable)
@@ -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}) {