From 9b570dd0e2a96ef5bbb4a9811cd90205cb45edf5 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 26 Apr 2012 07:04:59 +0100 Subject: moduleapi: module:depends(): Don't load shared modules onto the current host if the current host is '*'... --- core/moduleapi.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/moduleapi.lua') diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 1f8c492d..1c676bc3 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -124,7 +124,8 @@ function api:depends(name) end); end local mod = modulemanager.get_module(self.host, name) or modulemanager.get_module("*", name); - if mod and mod.module.host == "*" and modulemanager.module_has_method(mod, "add_host") then + if mod and mod.module.host == "*" and self.host ~= "*" + and modulemanager.module_has_method(mod, "add_host") then mod = nil; -- This is a shared module, so we still want to load it on our host end if not mod then -- cgit v1.2.3