Comparison

executables: Invoke loader to allow mixing of old and new import style Now both require"util.foo" and require"prosody.util.foo" should be equivalent.

comparison

equal deleted inserted replaced

-:ebe3b2f96cad
+:4f2accd99373
 -- Check before first require, to preempt the probable failure
 if _VERSION < "Lua 5.2" then
 	io.stderr:write("Prosody is no longer compatible with Lua 5.1\n")
 	io.stderr:write("See https://prosody.im/doc/depends#lua for more information\n")
 	return os.exit(1);
+end
+if not pcall(require, "prosody.loader") then
+	pcall(require, "loader");
 end
 local startup = require "util.startup";
 startup.prosodyctl();