From fc66b63ffe67ace513f4aa749efbf4c56436747c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 27 Jan 2014 18:25:52 +0100 Subject: [PATCH] small fix to package lib; nicer error logging in autorun (location in lib shouldn't be in the message) --- assets/opencomputers/lua/rom/boot/90_filesystem.lua | 2 +- assets/opencomputers/lua/rom/lib/package.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/opencomputers/lua/rom/boot/90_filesystem.lua b/assets/opencomputers/lua/rom/boot/90_filesystem.lua index dcdb40487..9204a4262 100644 --- a/assets/opencomputers/lua/rom/boot/90_filesystem.lua +++ b/assets/opencomputers/lua/rom/boot/90_filesystem.lua @@ -36,7 +36,7 @@ local function onComponentAdded(_, address, componentType) local function run() local result, reason = shell.execute(fs.concat(name, "autorun"), _ENV, proxy) if not result and reason ~= "file not found" then - error(reason) + error(reason, 0) end end if isInitialized then diff --git a/assets/opencomputers/lua/rom/lib/package.lua b/assets/opencomputers/lua/rom/lib/package.lua index 6c25fefe0..b86fdabda 100644 --- a/assets/opencomputers/lua/rom/lib/package.lua +++ b/assets/opencomputers/lua/rom/lib/package.lua @@ -58,7 +58,7 @@ end local function pathSearcher(module) local filepath, reason = package.searchpath(module, package.path) if filepath then - local loader, reason = loadfile(filepath, "bt", _G), filepath + local loader, reason = loadfile(filepath, "bt", _G) if loader then return loader, filepath else