Software / code / prosody
Changeset
4135:9dfb3c0101b5
modulemanager: Fix disabling a module on a single host
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 01 Feb 2011 17:56:16 -0800 |
| parents | 4132:ccc16434dbe2 |
| children | 4136:19f2830fbe02 |
| files | core/modulemanager.lua |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
