d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: Sprinkle some verbose_loading salt

Browse Source 
Our module loading messages should be hidden without verbose_loading -- go
ahead and do that as a first step.
This commit is contained in:
Kyle Evans 2018-03-13 02:59:13 +00:00
parent 4ba257591b
commit f0b03262c0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=330825
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stand/lua/config.lua
View File

@ -197,6 +197,7 @@ end
config.env_changed = {} config.env_changed = {}
-- Values to restore env to (nil to unset) -- Values to restore env to (nil to unset)
config.env_restore = {} config.env_restore = {}
config.verbose = false
-- The first item in every carousel is always the default item. -- The first item in every carousel is always the default item.
function config.getCarouselIndex(id) function config.getCarouselIndex(id)
@ -490,6 +491,11 @@ function config.load(file)
-- Cache the provided module_path at load time for later use -- Cache the provided module_path at load time for later use
config.module_path = loader.getenv("module_path") config.module_path = loader.getenv("module_path")
local verbose = loader.getenv("verbose_loading")
if verbose == nil then
verbose = "no"
end
config.verbose = verbose:lower() == "yes"
end end
-- Reload configuration -- Reload configuration
@ -512,7 +518,7 @@ function config.loadelf()
end end
print(MSG_MODLOADING) print(MSG_MODLOADING)
if not config.loadmod(modules) then if not config.loadmod(modules, not config.verbose) then
print(MSG_MODLOADFAIL) print(MSG_MODLOADFAIL)
end end
end end