Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 7af744f6ab18fe2bc0132891ce7c4fc3a461040f..453d19670d2bfc6113c2d87b3d0af44242823754 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -124,6 +124,27 @@ sub merge ($) {
        }
 }
 
        }
 }
 

+sub disabled_plugins (@) {
+       # Handles running disable hooks of plugins that were enabled
+       # previously, but got disabled when a new setup file was loaded.
+       if (exists $config{setupfile} && @_) {
+               # Fork a child to load the disabled plugins.
+               my $pid=fork();
+               if ($pid == 0) {
+                       foreach my $plugin (@_) {
+                               eval { IkiWiki::loadplugin($plugin, 1) };
+                               if (exists $IkiWiki::hooks{disable}{$plugin}{call}) {
+                                       eval { $IkiWiki::hooks{disable}{$plugin}{call}->() };
+                               }
+                       }
+                       exit(0);
+               }
+               else {
+                       waitpid $pid, 0;
+               }
+       }
+}
+

 sub getsetup () {
        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.
 sub getsetup () {
        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.


@@ -134,6 +155,7 @@ sub getsetup () {
         $config{syslog}=undef;
 
        # Load all plugins, so that all setup options are available.
         $config{syslog}=undef;
 
        # Load all plugins, so that all setup options are available.

+       my %original_loaded_plugins=%IkiWiki::loaded_plugins;

        my @plugins=IkiWiki::listplugins();
        foreach my $plugin (@plugins) {
                eval { IkiWiki::loadplugin($plugin, 1) };
        my @plugins=IkiWiki::listplugins();
        foreach my $plugin (@plugins) {
                eval { IkiWiki::loadplugin($plugin, 1) };


@@ -141,6 +163,7 @@ sub getsetup () {
                        my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
                }
        }
                        my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
                }
        }

+       %IkiWiki::loaded_plugins=%original_loaded_plugins;

        
        my %sections;
        foreach my $plugin (@plugins) {
        
        my %sections;
        foreach my $plugin (@plugins) {


@@ -149,6 +172,11 @@ sub getsetup () {
                        my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
                        next unless @s;
 
                        my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
                        next unless @s;
 

+                       if (scalar(@s) % 2 != 0) {
+                               print STDERR "warning: plugin $plugin has a broken getsetup; ignoring\n";
+                               next;
+                       }
+

                        # set default section value (note use of shared
                        # hashref between array and hash)
                        my %s=@s;
                        # set default section value (note use of shared
                        # hashref between array and hash)
                        my %s=@s;


@@ -200,6 +228,10 @@ sub commented_dump ($$) {
                my $setup=$pair->[1];
                my %s=@{$setup};
                my $section=$s{plugin}->{section};
                my $setup=$pair->[1];
                my %s=@{$setup};
                my $section=$s{plugin}->{section};

+               if (! defined $section) {
+                       print STDERR "warning: missing section in $plugin\n";
+                       $section="other";
+               }

                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {
                        push @ret, "", $indent.("#" x 70), "$indent# $section plugins",
                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {
                        push @ret, "", $indent.("#" x 70), "$indent# $section plugins",