X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FSetup.pm;h=48f3d4634da0371f988ba16ae1107849fcd24172;hb=2e086b3263f33d3d42ddbcb451e9995c466929cd;hp=5b77a6471111d28a0090a769d1c3cbac804e6792;hpb=d4c11466bad0e0aa3ac3c6f0bfc7577633d0d744;p=ikiwiki.git

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 5b77a6471..48f3d4634 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -75,7 +75,8 @@ sub dump ($) {
 	}
 	else {
 		waitpid $pid, 0;
-		exit $? if $?;
+		exit($? >> 8) if $? >> 8;
+		exit(1) if $?;
 	}
 }
 
@@ -123,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.
@@ -133,6 +155,7 @@ sub getsetup () {
         $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) };
@@ -140,6 +163,7 @@ sub getsetup () {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
+	%IkiWiki::loaded_plugins=%original_loaded_plugins;
 	
 	my %sections;
 	foreach my $plugin (@plugins) {