avoid syslog whining from broken plugins

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 94c1b4214919a93a91e2899793777ef80171f0ea..6aab04e320fe21d02a36a9334ab0f3ab068bd191 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -143,8 +143,6 @@ sub showplugintoggle ($$$$) { #{{{
                return 0;
        }
 
                return 0;
        }
 

-       print STDERR ">>$plugin (@{$config{websetup_force_plugins}})\n";
-

        $form->field(
                name => "enable.$plugin",
                label => "",
        $form->field(
                name => "enable.$plugin",
                label => "",

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index d14be879d5f1aab1f432d46bd42f9d824e95c14a..02a462082cc476530d16c9d6477122727f713bf6 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -76,6 +76,10 @@ sub getsetup () { #{{{
        # [plugin, setup] pairs.
        my @ret;
 
        # [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
        # 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 ],
                }
        }
                        push @ret, [ $plugin, \@s ],
                }
        }

+       
+        $config{syslog}=$syslog;

 
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}