From 4a5edafcbec3e58aa9170b8f8b64979928bb5bee Mon Sep 17 00:00:00 2001
From: Robert McLay <mclay@zaniahgroup.com>
Date: Mon, 1 Nov 2021 13:44:35 -0500
Subject: [PATCH] Issue #538: Fixed regex from "(@" to "%(@" when doing "ml
 overview".

---
 README.new                | 4 ++--
 rt/avail/avail.tdesc      | 3 +++
 rt/avail/dot.modulerc.lua | 1 +
 src/Master.lua            | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 rt/avail/dot.modulerc.lua

diff --git a/README.new b/README.new
index c9fd147f3..ca9040ac4 100644
--- a/README.new
+++ b/README.new
@@ -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
@@ -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".
diff --git a/rt/avail/avail.tdesc b/rt/avail/avail.tdesc
index d9c2a7c2d..19c2c0863 100644
--- a/rt/avail/avail.tdesc
+++ b/rt/avail/avail.tdesc
@@ -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
diff --git a/rt/avail/dot.modulerc.lua b/rt/avail/dot.modulerc.lua
new file mode 100644
index 000000000..10f24160d
--- /dev/null
+++ b/rt/avail/dot.modulerc.lua
@@ -0,0 +1 @@
+module_alias("ucc14","ucc/14.0.2")
diff --git a/src/Master.lua b/src/Master.lua
index 0396cd691..e3576bf9b 100644
--- a/src/Master.lua
+++ b/src/Master.lua
@@ -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