# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1296611776 28800
# Node ID 9dfb3c0101b5e091fadeaea0f6676c7d889c9153
# Parent  ccc16434dbe261c6fe9f393342afa5e1120f2d3f
modulemanager: Fix disabling a module on a single host

diff -r ccc16434dbe2 -r 9dfb3c0101b5 core/modulemanager.lua
--- a/core/modulemanager.lua	Mon Jan 31 13:05:49 2011 +0000
+++ b/core/modulemanager.lua	Tue Feb 01 17:56:16 2011 -0800
@@ -68,12 +68,11 @@
 	if host_modules_enabled == global_modules_enabled then host_modules_enabled = nil; end
 	if host_modules_disabled == global_modules_disabled then host_modules_disabled = nil; end
 	
-	local host_modules = set.new(host_modules_enabled) - set.new(host_modules_disabled);
 	local global_modules = set.new(autoload_modules) + set.new(global_modules_enabled) - set.new(global_modules_disabled);
 	if component then
 		global_modules = set.intersection(set.new(component_inheritable_modules), global_modules);
 	end
-	local modules = global_modules + host_modules;
+	local modules = (global_modules + set.new(host_modules_enabled)) - set.new(host_modules_disabled);
 	
 	-- COMPAT w/ pre 0.8
 	if modules:contains("console") then