Skip to content

Commit

Permalink
Issue #538: Fixed regex from "(@" to "%(@" when doing "ml overview".
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Nov 1, 2021
1 parent bc638c8 commit 4a5edaf
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.new
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Lmod 8.5+
(8.5.16) * Fix bugs with cmake and perl test because of the renaming of cmake.in
and perl.in to cmake and perl.
(8.5.17) * Issue #532: Change AVAIL_EXTENSION to AVAIL_EXTENSIONS in Makefile.in
* Now use unload_internal and unload_usr_internal for all unlLoads
* Now use unload_internal and unload_usr_internal for all unloads
* Use MasterControl:build_unload() and MasterControl:do_not_build_unload() to control when
unload_internal switches mcp to be MC_Unload.
* Update TACC/SitePackage.lua and docs to use s_msgT instead of s_msgA to
Expand All @@ -52,4 +52,4 @@ W.I.P:
This is an update to Issue #518 fix in 8.5.7
* Modify test.yml to support running "make busted"
* Issue #537: Remove all trailing newlines from TCL arguments

* Issue #538: Fixed regex from "(@" to "%(@" when doing "ml overview".
3 changes: 3 additions & 0 deletions rt/avail/avail.tdesc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ testdescript = {
runLmod use $(testDir)/mf/Core2 #14
runLmod avail local #15
runLmod --ignore_cache avail #16
export LMOD_MODULERCFILE=$testDir/dot.modulerc.lua
runLmod overview #17
unset LMOD_MODULERCFILE
runLmod purge #18
unsetMT
Expand Down
1 change: 1 addition & 0 deletions rt/avail/dot.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module_alias("ucc14","ucc/14.0.2")
4 changes: 2 additions & 2 deletions src/Master.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1024,10 +1024,10 @@ function M.overview(self,argA)
for i = 1,#aa do
local entry = aa[i]:sub(1,-2) --> strip trailing newline
repeat
if (entry:find("(@")) then
dbg.print{"RTM: entry: ",entry,"\n"}
if (entry:find("%(@")) then
break
end
dbg.print{"entry: ",entry,"\n"}
if (entry:find(":$")) then
register_sn_count_in_b(false)
if (next(b) ~= nil) then
Expand Down

0 comments on commit 4a5edaf

Please sign in to comment.