Fix plugin version check

This commit is contained in:
Francesco Abbate 2021-08-25 23:45:18 +02:00
parent b76917ef9e
commit dc501cb41a
1 changed files with 13 additions and 11 deletions

View File

@ -687,17 +687,19 @@ function core.load_plugins()
for filename, plugin_dir in pairs(files) do for filename, plugin_dir in pairs(files) do
local basename = filename:match("(.-)%.lua$") or filename local basename = filename:match("(.-)%.lua$") or filename
local version_match = check_plugin_version(plugin_dir .. '/' .. filename) local is_lua_file, version_match = check_plugin_version(plugin_dir .. '/' .. filename)
if not version_match then if is_lua_file then
core.log_quiet("Version mismatch for plugin %q from %s", basename, plugin_dir) if not version_match then
local list = refused_list[plugin_dir:find(USERDIR) == 1 and 'userdir' or 'datadir'].plugins core.log_quiet("Version mismatch for plugin %q from %s", basename, plugin_dir)
table.insert(list, filename) local list = refused_list[plugin_dir:find(USERDIR) == 1 and 'userdir' or 'datadir'].plugins
end table.insert(list, filename)
if version_match and config.plugins[basename] ~= false then end
local ok = core.try(require, "plugins." .. basename) if version_match and config.plugins[basename] ~= false then
if ok then core.log_quiet("Loaded plugin %q from %s", basename, plugin_dir) end local ok = core.try(require, "plugins." .. basename)
if not ok then if ok then core.log_quiet("Loaded plugin %q from %s", basename, plugin_dir) end
no_errors = false if not ok then
no_errors = false
end
end end
end end
end end