Skip to content

Commit 1ccb014

Browse files
author
Robert McLay
committed
Merge branch 'main' into IS748-shFunc
2 parents 8f20891 + 4781d26 commit 1ccb014

File tree

10 files changed

+46
-14
lines changed

10 files changed

+46
-14
lines changed

‎messageDir/en.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ To search the contents of modules for matching words execute:
258258
259259
$ module keyword %{s}
260260
]==], --
261-
m_Module_Msgs_close = "%{border}",
261+
m_Module_Msgs_close = "%{border}\n\n",
262262
m_Other_matches = "\n Other possible modules matches:\n %{bb}\n",
263263
m_Other_possible = [==[
264264
Other possible modules matches:

‎rt/common_funcs.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ initStdEnvVars()
288288
unset SHLIB_PATH
289289
unset TERM
290290
unset _LMFILES_
291+
unset LMOD_EXPERT
292+
unset LMOD_QUIET
291293
unset LMOD_CACHED_LOADS
292294
unset LMOD_DISPLAY_META_COLOR
293295
unset LMOD_DISPLAY_SN_COLOR

‎rt/load/err.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
step 1
33
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
44
===========================
5-
Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
5+
Modules based on Lua: Version 8.7.56 2025-02-04 18:12 -07:00
66
by Robert McLay [email protected]
77
===========================
88
step 2
@@ -589,3 +589,7 @@ If the avail list is too long consider trying:
589589
"module overview" or "ml ov" to display the number of modules for each name.
590590
Use "module spider" to find all possible modules and extensions.
591591
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
592+
===========================
593+
step 79
594+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing update
595+
===========================

‎rt/load/load.tdesc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ testdescript = {
144144
runLmod load setPrompt # 76
145145
runLmod list # 77
146146
runLmod avail # 78
147-
147+
runLmod update # 79
148148
149149
150150

‎rt/load/out.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,3 +944,13 @@ MODULEPATH=ProjectDIR/rt/load/mf6;
944944
export MODULEPATH;
945945
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={longVersion={fn="ProjectDIR/rt/load/mf6/longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug.lua",fullName="longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug",loadOrder=1,propT={},stackDepth=0,status="active",userName="longVersion",wV="*branch.60200614194619.*_.*w.000000009.*d.000000009.*a.30560903608993972840.*ea.000000004.*qw.000000004.*d.000000009.*bb.000000443.*debug.*zfinal",},setPrompt={fn="ProjectDIR/rt/load/mf6/setPrompt/1.0.lua",fullName="setPrompt/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="setPrompt",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/load/mf6",},systemBaseMPATH="ProjectDIR/rt/load/mf6",}';
946946
export _ModuleTable_;
947+
===========================
948+
step 79
949+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing update
950+
===========================
951+
MODULEPATH=ProjectDIR/rt/load/mf6;
952+
export MODULEPATH;
953+
MY_PS1=\[\\u@\\h\ \\W\]\\\$\ ;
954+
export MY_PS1;
955+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={longVersion={fn="ProjectDIR/rt/load/mf6/longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug.lua",fullName="longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug",loadOrder=1,propT={},stackDepth=0,status="active",userName="longVersion",wV="*branch.60200614194619.*_.*w.000000009.*d.000000009.*a.30560903608993972840.*ea.000000004.*qw.000000004.*d.000000009.*bb.000000443.*debug.*zfinal",},setPrompt={fn="ProjectDIR/rt/load/mf6/setPrompt/1.0.lua",fullName="setPrompt/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="setPrompt",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/load/mf6",},systemBaseMPATH="ProjectDIR/rt/load/mf6",}';
956+
export _ModuleTable_;

‎rt/show/err.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,20 @@ Try:
103103
to see if the module(s) are available across all compilers and MPI implementations.
104104
===========================
105105
step 14
106+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show nosuchmodule
107+
===========================
108+
===========================
109+
step 15
106110
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --location show a
107111
===========================
108112
ProjectDIR/rt/show/mf/Core2/a/1.0.lua
109113
===========================
110-
step 15
114+
step 16
111115
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --terse show a
112116
===========================
113117
ProjectDIR/rt/show/mf/Core2/a/1.0.lua
114118
===========================
115-
step 16
119+
step 17
116120
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show showMe
117121
===========================
118122
ProjectDIR/rt/show/mf/Core/showMe/2.0.lua:

‎rt/show/out.txt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,30 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing show nosuchmodule
107107
false
108108
===========================
109109
step 14
110-
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --location show a
110+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show nosuchmodule
111111
===========================
112112
MODULEPATH=ProjectDIR/rt/show/mf/Core2:ProjectDIR/rt/show/mf/Core;
113113
export MODULEPATH;
114114
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={boost={fn="ProjectDIR/rt/show/mf/Core/boost/1.47.1.lua",fullName="boost/1.47.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="boost/1.47.1",wV="000000001.000000047.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/show/mf/Core2","ProjectDIR/rt/show/mf/Core",},systemBaseMPATH="ProjectDIR/rt/show/mf/Core",}';
115115
export _ModuleTable_;
116116
===========================
117117
step 15
118-
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --terse show a
118+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --location show a
119119
===========================
120120
MODULEPATH=ProjectDIR/rt/show/mf/Core2:ProjectDIR/rt/show/mf/Core;
121121
export MODULEPATH;
122122
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={boost={fn="ProjectDIR/rt/show/mf/Core/boost/1.47.1.lua",fullName="boost/1.47.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="boost/1.47.1",wV="000000001.000000047.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/show/mf/Core2","ProjectDIR/rt/show/mf/Core",},systemBaseMPATH="ProjectDIR/rt/show/mf/Core",}';
123123
export _ModuleTable_;
124124
===========================
125125
step 16
126+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --terse show a
127+
===========================
128+
MODULEPATH=ProjectDIR/rt/show/mf/Core2:ProjectDIR/rt/show/mf/Core;
129+
export MODULEPATH;
130+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={boost={fn="ProjectDIR/rt/show/mf/Core/boost/1.47.1.lua",fullName="boost/1.47.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="boost/1.47.1",wV="000000001.000000047.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/show/mf/Core2","ProjectDIR/rt/show/mf/Core",},systemBaseMPATH="ProjectDIR/rt/show/mf/Core",}';
131+
export _ModuleTable_;
132+
===========================
133+
step 17
126134
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show showMe
127135
===========================
128136
MODULEPATH=ProjectDIR/rt/show/mf/Core2:ProjectDIR/rt/show/mf/Core;

‎rt/show/show.tdesc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ testdescript = {
3535
runLmod show a #11
3636
runLmod show b_tcl #12
3737
runLmod show nosuchmodule #13
38-
runLmod --location show a #14
39-
runLmod --terse show a #15
40-
runLmod show showMe #16
38+
export LMOD_QUIET=1
39+
runLmod show nosuchmodule #14 (no warning message printed because LMOD_QUIET is set.)
40+
unset LMOD_QUIET
41+
runLmod --location show a #15
42+
runLmod --terse show a #16
43+
runLmod show showMe #17
4144
4245
HOME=$ORIG_HOME
4346

‎src/Hub.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ function M.access(self, ...)
158158

159159

160160
if (#a > 0) then
161-
LmodError{msg="e_Failed_2_Find_w_Access",quote_comma_list=concatTbl(a,"\", \""),
162-
module_list=concatTbl(a," ")}
161+
local report = quiet() and LmodWarning or LmodError
162+
report{msg="e_Failed_2_Find_w_Access",quote_comma_list=concatTbl(a,"\", \""),
163+
module_list=concatTbl(a," ")}
163164
end
164-
dbg.fini("Hub:access")
165-
end
165+
dbg.fini("Hub:access")end
166166

167167
--------------------------------------------------------------------------
168168
-- This function marks a module name as loaded and saves

‎src/cmdfuncs.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,7 @@ end
12041204
--------------------------------------------------------------------------
12051205
-- Reload all modules.
12061206
function Update()
1207+
local mrc = MRC:singleton(); mrc:set_display_mode("all")
12071208
local hub = Hub:singleton()
12081209
local force_update = true
12091210
hub:reloadAll(force_update)

0 commit comments

Comments
 (0)