From 24245b60d112dcee347bf7c073b4715782ca0c23 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 10 Nov 2010 19:54:38 +0500 Subject: modulemanager: load_modules_for_host(): For components, the inherited modules are the intersection of the inheritable and global modules lists, not the difference. --- core/modulemanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/modulemanager.lua b/core/modulemanager.lua index d6471850..e228e48d 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -73,7 +73,7 @@ function load_modules_for_host(host) 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.new(component_inheritable_modules) - global_modules; + global_modules = set.intersection(set.new(component_inheritable_modules), global_modules); end local modules = global_modules + host_modules; -- cgit v1.2.3