Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Mar 2018 02:59:13 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r330825 - head/stand/lua
Message-ID:  <201803130259.w2D2xDwQ098715@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Tue Mar 13 02:59:13 2018
New Revision: 330825
URL: https://svnweb.freebsd.org/changeset/base/330825

Log:
  lualoader: Sprinkle some verbose_loading salt
  
  Our module loading messages should be hidden without verbose_loading -- go
  ahead and do that as a first step.

Modified:
  head/stand/lua/config.lua

Modified: head/stand/lua/config.lua
==============================================================================
--- head/stand/lua/config.lua	Tue Mar 13 01:19:07 2018	(r330824)
+++ head/stand/lua/config.lua	Tue Mar 13 02:59:13 2018	(r330825)
@@ -197,6 +197,7 @@ end
 config.env_changed = {}
 -- Values to restore env to (nil to unset)
 config.env_restore = {}
+config.verbose = false
 
 -- The first item in every carousel is always the default item.
 function config.getCarouselIndex(id)
@@ -490,6 +491,11 @@ function config.load(file)
 
 	-- Cache the provided module_path at load time for later use
 	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
 
 -- Reload configuration
@@ -512,7 +518,7 @@ function config.loadelf()
 	end
 
 	print(MSG_MODLOADING)
-	if not config.loadmod(modules) then
+	if not config.loadmod(modules, not config.verbose) then
 		print(MSG_MODLOADFAIL)
 	end
 end



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803130259.w2D2xDwQ098715>