prosody
b602dd3c4bbc
core/modulemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/modulemanager.lua @ 11287:b602dd3c4bbc

core.modulemanager: Fix resource location compat with LuaRocks 2.x The path doesn't include lua version, at least least on Debian, which still has luarocks 2.x
author Kim Alvefur <zash@zash.se>
date Sat, 16 Jan 2021 00:24:06 +0100
parent 11151:498b3ab49b9c
child 11585:057ce005937e
comparison
equal deleted inserted replaced
11286:336cba957c88 11287:b602dd3c4bbc
207 local manifest_filename = luarocks_path.."/manifest"; 207 local manifest_filename = luarocks_path.."/manifest";
208 local load_manifest, err = envload.envloadfile(manifest_filename, manifest); 208 local load_manifest, err = envload.envloadfile(manifest_filename, manifest);
209 if not load_manifest then 209 if not load_manifest then
210 -- COMPAT Luarocks 2.x 210 -- COMPAT Luarocks 2.x
211 log("debug", "Could not load LuaRocks 3.x manifest, trying 2.x", err); 211 log("debug", "Could not load LuaRocks 3.x manifest, trying 2.x", err);
212 luarocks_path = custom_plugins.."/lib/luarocks/rocks-"..lua_version; 212 luarocks_path = custom_plugins.."/lib/luarocks/rocks";
213 manifest_filename = luarocks_path.."/manifest"; 213 manifest_filename = luarocks_path.."/manifest";
214 load_manifest, err = envload.envloadfile(manifest_filename, manifest); 214 load_manifest, err = envload.envloadfile(manifest_filename, manifest);
215 end 215 end
216 if not load_manifest then 216 if not load_manifest then
217 log("error", "Could not load manifest of installed plugins: %s", err, load_manifest); 217 log("error", "Could not load manifest of installed plugins: %s", err, load_manifest);