D45882.id140585.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45882.id140585.diff
View Options

	diff --git a/stand/lua/core.lua b/stand/lua/core.lua
	--- a/stand/lua/core.lua
	+++ b/stand/lua/core.lua
	@@ -65,7 +65,13 @@
	-- message on failure.
	function try_include(module)
	if module:sub(1, 1) ~= "/" then
	- module = loader.lua_path .. "/" .. module
	+ local lua_path = loader.lua_path
	+ -- XXX Temporary compat shim; this should be removed once the
	+ -- loader.lua_path export has sufficiently spread.
	+ if lua_path == nil then
	+ lua_path = "/boot/lua"
	+ end
	+ module = lua_path .. "/" .. module
	-- We only attempt to append an extension if an absolute path
	-- wasn't specified. This assumes that the caller either wants
	-- to treat this like it would require() and specify just the
	@@ -536,7 +542,7 @@
	end
	end

	-if not pager then
	+if not pager or loader.lua_path == nil then
	print("**********************************************************************")
	print("**********************************************************************")
	print("*** ***")