Mercurial > prosody-hg
changeset 14067:6ccc6e0ece29
Merge 13.0->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 09 Feb 2026 17:11:52 +0100 |
| parents | 50b8d732c905 (current diff) b085d32af140 (diff) |
| children | af28d6debaca |
| files | prosody prosodyctl tools/migration/prosody-migrator.lua |
| diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Mon Feb 09 15:54:02 2026 +0100 +++ b/prosody Mon Feb 09 17:11:52 2026 +0100 @@ -42,7 +42,11 @@ package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path); package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath); - require "prosody.loader"; + if pcall(dofile, CFG_SOURCEDIR .. "/loader.lua") then + package.loaded["prosody.loader"] = true; + else + require "prosody.loader"; + end else -- Not installed, e.g. running from a source checkout require "loader";
--- a/prosodyctl Mon Feb 09 15:54:02 2026 +0100 +++ b/prosodyctl Mon Feb 09 17:11:52 2026 +0100 @@ -42,7 +42,11 @@ package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path); package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath); - require "prosody.loader"; + if pcall(dofile, CFG_SOURCEDIR .. "/loader.lua") then + package.loaded["prosody.loader"] = true; + else + require "prosody.loader"; + end else -- Not installed, e.g. running from a source checkout require "loader";
--- a/tools/migration/prosody-migrator.lua Mon Feb 09 15:54:02 2026 +0100 +++ b/tools/migration/prosody-migrator.lua Mon Feb 09 17:11:52 2026 +0100 @@ -31,7 +31,11 @@ package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path); package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath); - require "prosody.loader"; + if pcall(dofile, CFG_SOURCEDIR .. "/loader.lua") then + package.loaded["prosody.loader"] = true; + else + require "prosody.loader"; + end else -- Not installed, e.g. running from a source checkout require "loader";