summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/websetup.pm2
-rw-r--r--IkiWiki/Setup.pm6
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 94c1b4214..6aab04e32 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -143,8 +143,6 @@ sub showplugintoggle ($$$$) { #{{{
return 0;
}
- print STDERR ">>$plugin (@{$config{websetup_force_plugins}})\n";
-
$form->field(
name => "enable.$plugin",
label => "",
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index d14be879d..02a462082 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -76,6 +76,10 @@ sub getsetup () { #{{{
# [plugin, setup] pairs.
my @ret;
+ # disable logging to syslog while dumping, broken plugins may whine when loaded
+ my $syslog=$config{syslog};
+ $config{syslog}=0;
+
# Load all plugins, so that all setup options are available.
my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
@@ -94,6 +98,8 @@ sub getsetup () { #{{{
push @ret, [ $plugin, \@s ],
}
}
+
+ $config{syslog}=$syslog;
return @ret;
} #}}}