From 8805e7cf095b0e013c22bc7cf57da9c9eca9accb Mon Sep 17 00:00:00 2001
From: Robert McLay <mclay@zaniahgroup.com>
Date: Wed, 9 Oct 2024 13:02:45 -0500
Subject: [PATCH 1/2] Lmod warning comment added

---
 docs/source/025_new.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/025_new.rst b/docs/source/025_new.rst
index 87d5f8ebf..f10d7a2a7 100644
--- a/docs/source/025_new.rst
+++ b/docs/source/025_new.rst
@@ -16,6 +16,9 @@ New Features in Lmod
    *depends_on()* except that Lmod picks the first available in the
    list. 
 
+**Lmod Warnings**
+   (Lmod 8.7.33) Lmod warning nolonger set the error status on exit.
+
 **hook.register(<hook_name>, func, <action>)**
    (Lmod 8.7.25+) The hook.register function now takes a optional third
    argument: action.  The legal actions are the followning strings:

From ec592bb8772244c6180b5a38aac0a4bda5e8acb5 Mon Sep 17 00:00:00 2001
From: Robert McLay <mclay@zaniahgroup.com>
Date: Wed, 9 Oct 2024 13:13:58 -0500
Subject: [PATCH 2/2] Clean up diff hack for load test

---
 rt/load/err.txt    | 2 +-
 rt/load/load.tdesc | 9 +++++----
 rt/load/out.txt    | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rt/load/err.txt b/rt/load/err.txt
index f4d082653..85c6471a2 100644
--- a/rt/load/err.txt
+++ b/rt/load/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
diff --git a/rt/load/load.tdesc b/rt/load/load.tdesc
index b4d4bd4f7..b4924a049 100644
--- a/rt/load/load.tdesc
+++ b/rt/load/load.tdesc
@@ -121,10 +121,11 @@ testdescript = {
      runLmod load   compiler/intel                          # 68
      runLmod unload compiler/intel                          # 69
      env | sort > end.env.xyzzy
-     diff start.env.xyzzy end.env.xyzzy | $SED \
-          -e 's/^.*_ModuleTable.*//'           \
-          -e 's/^[0-9]\+[ac][0-9]\+.*//'       \
-          -e '/^ *$/d'                         \
+     diff start.env.xyzzy end.env.xyzzy | $SED   \
+          -e 's/^.*_ModuleTable.*//'             \
+          -e 's/^[0-9]\+[ac][0-9]\+.*//'         \
+          -e 's/^[0-9]\+,[0-9]\+[ac][0-9]\+.*//' \
+          -e '/^ *$/d'                           \
           > diff.env.xyzzy
 
      runBase cat diff.env.xyzzy                             # 70
diff --git a/rt/load/out.txt b/rt/load/out.txt
index ffba086de..06e11cbb6 100644
--- a/rt/load/out.txt
+++ b/rt/load/out.txt
@@ -855,7 +855,6 @@ export _ModuleTable_;
 step 70
 cat diff.env.xyzzy
 ===========================
-49,50c49,50
 < __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/load/mf3:1
 > __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/load/mf4:1
 > __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:1;/bin:1