From 94f7f0b95ed1fd420613b9bd47a71e722f773459 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Oct 2018 17:11:10 +0200 Subject: moduleapi: Prevent loading disabled module as dependency of enabled one Explicitly disabled module should stay disabled. --- core/moduleapi.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/moduleapi.lua') diff --git a/core/moduleapi.lua b/core/moduleapi.lua index c19594c1..10f9f04d 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -129,6 +129,9 @@ end function api:depends(name) local modulemanager = require"core.modulemanager"; + if self:get_option_inherited_set("modules_disabled", {}):contains(name) then + error("Dependency on disabled module mod_"..name); + end if not self.dependencies then self.dependencies = {}; self:hook("module-reloaded", function (event) @@ -145,9 +148,6 @@ function api:depends(name) end end); end - if self:get_option_inherited_set("modules_disabled", {}):contains(name) then - self:log("warn", "Loading prerequisite mod_%s despite it being disabled", name); - end local mod = modulemanager.get_module(self.host, name) or modulemanager.get_module("*", name); if mod and mod.module.host == "*" and self.host ~= "*" and modulemanager.module_has_method(mod, "add_host") then -- cgit v1.2.3