Author: kevans
Date: Thu Nov 1 17:37:20 2018
New Revision: 340012
URL: https://svnweb.freebsd.org/changeset/base/340012
Log:
MFC r339849: lualoader: Fix try_include error handling
The previous iteration of try_include attempted to be 'friendly' and error()
out if we hit an error that wasn't ENOENT. This was semi-OK, but fragile as
it relied on pattern matching the error message.
Move the responsibility for handling failure to the caller. Following
a common lua pattern, we'll return the return value of the underlying
require() on success, or false and an error message.
Approved by: re (gjb)
Modified:
stable/12/stand/lua/core.lua
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/stand/lua/core.lua
==============================================================================
--- stable/12/stand/lua/core.lua Thu Nov 1 17:36:42 2018
(r340011)
+++ stable/12/stand/lua/core.lua Thu Nov 1 17:37:20 2018
(r340012)
@@ -66,23 +66,15 @@ end
-- Globals
--- try_include will return the loaded module on success, or nil on failure.
--- A message will also be printed on failure, with one exception: non-verbose
--- loading will suppress 'module not found' errors.
+-- try_include will return the loaded module on success, or false and the error
+-- message on failure.
function try_include(module)
local status, ret = pcall(require, module)
-- ret is the module if we succeeded.
if status then
return ret
end
- -- Otherwise, ret is just a message; filter out ENOENT unless we're
- -- doing a verbose load. As a consequence, try_include prior to loading
- -- configuration will not display 'module not found'. All other errors
- -- in loading will be printed.
- if config.verbose or ret:match("^module .+ not found") == nil then
- error(ret, 2)
- end
- return nil
+ return false, ret
end
-- Module exports
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
