Mercurial > prosody-hg
diff loader.lua @ 14062:ef586363d90f 13.0
loader: Fix path setup
Since prosody etc usually add a path containing "prosody", the
substitution did not happen and community modules using the old import
style did not work.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 09 Feb 2026 01:53:50 +0100 |
| parents | 2f61ebcf37c0 |
| children | 76ece4dd9782 |
line wrap: on
line diff
--- a/loader.lua Sun Feb 08 17:44:17 2026 +0100 +++ b/loader.lua Mon Feb 09 01:53:50 2026 +0100 @@ -2,11 +2,9 @@ -- transition period while we update all require calls. if (...) == "prosody.loader" then - if not package.path:find "prosody" then - -- For require"util.foo" also look in paths equivalent to "prosody.util.foo" - package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); - package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); - end + -- For require"util.foo" also look in paths equivalent to "prosody.util.foo" + package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); + package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); else -- When requiring "prosody.x", also look for "x" for i = #package.searchers, 1, -1 do