From 708fed20d013e69fd79d80f0b59a45a25eed3a00 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Thu, 16 Apr 2020 09:43:59 -0700 Subject: Avoid uninitialized variable check, for Terra compatibility (#1182) This patch is required to support for Terra, a language embedded in Lua/LuaJIT with support for JITing high-performance code. The only change here is that Terra uses a strict mode by default, so the attempt to access an undefined global has be wrapped in pcall to make it safe. --- src/luarocks/loader.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index 969f4844..5aa84632 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua @@ -29,7 +29,8 @@ local require = nil -- Workaround for wrappers produced by older versions of LuaRocks local temporary_global = false -if luarocks then +local status, luarocks_value = pcall(function() return luarocks end) +if status and luarocks_value then -- The site_config.lua file generated by old versions uses module(), -- so it produces a global `luarocks` table. Since we have the table, -- add the `loader` field to make the old wrappers happy. -- cgit v1.2.3-55-g6feb