From e3ea8c442c451cdfde499c1ea82e55b33023d1f9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 3 Oct 2024 18:17:13 -0500 Subject: [PATCH] Issue #690: nolonger write out mrcT just mrcMpathT --- rt/cached_loads/cached_loads.tdesc | 2 +- rt/ck_mtree_syntax/err.txt | 2 +- rt/ck_mtree_syntax/out.txt | 5 - rt/common_funcs.sh | 4 +- rt/dbT/err.txt | 2 +- rt/dbT/out.txt | 5 - rt/help/err.txt | 14 ++- rt/i18n/err.txt | 5 +- rt/meta/err.txt | 2 +- rt/meta/out.txt | 5 - rt/modulerc/err.txt | 32 ++++-- rt/modulerc/mfD/Core/G/.modulerc.lua | 2 + rt/modulerc/mfD/Core/G/1.0.lua | 0 rt/modulerc/mfD/Core/G/2.0.lua | 0 rt/modulerc/mfD/Core/hardAll/.modulerc.lua | 3 +- rt/modulerc/out.txt | 119 +++++++++------------ rt/rmap/err.txt | 2 +- rt/rmap/out.txt | 15 --- rt/softwarePage/err.txt | 2 +- rt/softwarePage/out.txt | 5 - rt/spider/err.txt | 2 +- rt/spider/out.txt | 70 ------------ src/Cache.lua | 5 +- src/MRC.lua | 41 ++++--- 24 files changed, 117 insertions(+), 227 deletions(-) create mode 100644 rt/modulerc/mfD/Core/G/.modulerc.lua create mode 100644 rt/modulerc/mfD/Core/G/1.0.lua create mode 100644 rt/modulerc/mfD/Core/G/2.0.lua diff --git a/rt/cached_loads/cached_loads.tdesc b/rt/cached_loads/cached_loads.tdesc index 0fe0f991d..64dbafe9b 100644 --- a/rt/cached_loads/cached_loads.tdesc +++ b/rt/cached_loads/cached_loads.tdesc @@ -24,7 +24,7 @@ testdescript = { cacheDir=`userCacheDir` - remove_generated_lmod_files + remove_generated_lmod_files mf/Core/B runLmod --version # 1 diff --git a/rt/ck_mtree_syntax/err.txt b/rt/ck_mtree_syntax/err.txt index 7fe1855c8..a7f58c390 100644 --- a/rt/ck_mtree_syntax/err.txt +++ b/rt/ck_mtree_syntax/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.48 2024-08-19 16:18 -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/ck_mtree_syntax/out.txt b/rt/ck_mtree_syntax/out.txt index ba302f38b..180a671fe 100644 --- a/rt/ck_mtree_syntax/out.txt +++ b/rt/ck_mtree_syntax/out.txt @@ -14,11 +14,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/ck_mtree_syntax/mf timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/ck_mtree_syntax/mf"] = { diff --git a/rt/common_funcs.sh b/rt/common_funcs.sh index b2c631bd4..46a656ebf 100644 --- a/rt/common_funcs.sh +++ b/rt/common_funcs.sh @@ -31,8 +31,8 @@ cleanUp () -e "s|\o033|\\\033|g" \ -e "s|[\\]27|\\\033|g" \ -e "s|='\\\\033|='\\\\\\\\033|g" \ - -e "s|[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]|YYYY-MM-DDTHH:mm|g" \ - -e "s|[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]|YYYY-MM-DD|g" \ + -e "s|\"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]\"|\"YYYY-MM-DDTHH:mm\"|g" \ + -e "s|\"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\"|\"YYYY-MM-DD\"|g" \ -e "s|^User shell.*||" \ -e "s|\@git\@|$gitV|g" \ -e "s| $PATH_to_SHA1/$SHA1SUM| PATH_to_HASHSUM|g" \ diff --git a/rt/dbT/err.txt b/rt/dbT/err.txt index b6041591b..55e443ddd 100644 --- a/rt/dbT/err.txt +++ b/rt/dbT/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.47 2024-07-22 10:04 -04: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/dbT/out.txt b/rt/dbT/out.txt index 57d513ff6..78d64cf7b 100644 --- a/rt/dbT/out.txt +++ b/rt/dbT/out.txt @@ -27,11 +27,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/dbT/mf4 timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/dbT/mf3"] = { hiddenT = { diff --git a/rt/help/err.txt b/rt/help/err.txt index 79b8ee0bb..439cabdc6 100644 --- a/rt/help/err.txt +++ b/rt/help/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 @@ -31,6 +31,7 @@ Options: -r --regexp use regular expression match --gitversion Dump git version in a machine readable way and quit --dumpversion Dump version in a machine readable way and quit + --dumpname Dump the name Lmod in a machine readable way and quit --check_syntax --checkSyntax Checking module command syntax: do not load --config Report Lmod Configuration --miniConfig Report Lmod Configuration differences @@ -109,7 +110,7 @@ Lmod Web Sites SourceForge: https://lmod.sf.net TACC Homepage: https://www.tacc.utexas.edu/research-development/tacc-projects/lmod To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html -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 3 @@ -138,6 +139,7 @@ Options: -r --regexp use regular expression match --gitversion Dump git version in a machine readable way and quit --dumpversion Dump version in a machine readable way and quit + --dumpname Dump the name Lmod in a machine readable way and quit --check_syntax --checkSyntax Checking module command syntax: do not load --config Report Lmod Configuration --miniConfig Report Lmod Configuration differences @@ -216,7 +218,7 @@ Lmod Web Sites SourceForge: https://lmod.sf.net TACC Homepage: https://www.tacc.utexas.edu/research-development/tacc-projects/lmod To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html -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 4 @@ -236,7 +238,7 @@ Version 9 step 5 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --config =========================== -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 Description Value Allow root to use Lmod (LMOD_ALLOW_ROOT_USE) yes @@ -419,7 +421,7 @@ propT = { step 6 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --miniConfig =========================== -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 LMOD_PACKAGE_PATH D nil LMOD_SYSTEM_DEFAULT_MODULES D __unknown__ @@ -478,6 +480,8 @@ use regular expression match Dump git version in a machine readable way and quit =item I<--dumpversion> Dump version in a machine readable way and quit +=item I<--dumpname> +Dump the name Lmod in a machine readable way and quit =item I<--check_syntax --checkSyntax> Checking module command syntax: do not load =item I<--config> diff --git a/rt/i18n/err.txt b/rt/i18n/err.txt index 05d7cc780..6832c0e18 100644 --- a/rt/i18n/err.txt +++ b/rt/i18n/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.47 2024-07-22 10:04 -04: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 @@ -73,6 +73,7 @@ Options: -r --regexp Fait une recherche par expression régulière --gitversion Affiche la version git dans un format lisible par l'ordinateur --dumpversion Affiche la version dans un format lisible par l'ordinateur + --dumpname Dump the name Lmod in a machine readable way and quit --check_syntax --checkSyntax Vérifie la syntaxe, ne charge pas le module --config Affiche la configuration Lmod --miniConfig Report Lmod Configuration differences @@ -151,5 +152,5 @@ Sites web de Lmod SourceForge: https://lmod.sf.net TACC Homepage: https://www.tacc.utexas.edu/research-development/tacc-projects/lmod Pour rapporter un bogue, veuillez lire https://lmod.readthedocs.io/en/latest/075_bug_reporting.html -Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 +Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00 by Robert McLay mclay@tacc.utexas.edu diff --git a/rt/meta/err.txt b/rt/meta/err.txt index 52ec3a788..fdcc8d05b 100644 --- a/rt/meta/err.txt +++ b/rt/meta/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.6.9 2022-02-02 11:25 -04: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/meta/out.txt b/rt/meta/out.txt index 584e51b2f..23c8c4ca3 100644 --- a/rt/meta/out.txt +++ b/rt/meta/out.txt @@ -225,11 +225,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/meta/MF_FOO/A:ProjectDIR/rt/meta/MF_FOO/B timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/meta/MF_FOO/A"] = { diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt index 79584318a..4bab8ae91 100644 --- a/rt/modulerc/err.txt +++ b/rt/modulerc/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 @@ -893,8 +893,8 @@ step 73 lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail =========================== ProjectDIR/rt/modulerc/mfD/Core - C/1.0 C/3.0 (F,D) F/1.0 (NF) cluster/b hard/1.0 - C/2.0 D/3.0 (NF) cluster/a cluster/c + C/1.0 C/3.0 (F,D) F/1.0 (NF) cluster/a cluster/c + C/2.0 D/3.0 (NF) G/2.0 cluster/b hard/1.0 Where: D: Default Module F: Forbidden Module @@ -909,9 +909,10 @@ step 74 lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail =========================== ProjectDIR/rt/modulerc/mfD/Core - C/1.0 D/3.0 (NF) cluster/a cluster/.defaultCluster (H,F,D) - C/2.0 F/1.0 (NF) cluster/b hard/1.0 - C/3.0 (F,D) H/1.0 (s) cluster/c + C/1.0 F/1.0 (NF) cluster/a hard/1.0 + C/2.0 G/1.0 (H) cluster/b + C/3.0 (F,D) G/2.0 (D) cluster/c + D/3.0 (NF) H/1.0 (s) cluster/.defaultCluster (H,F,D) Where: D: Default Module F: Forbidden Module @@ -936,6 +937,9 @@ D/ D/3.0 F/ F/1.0 +G/ +G/1.0 +G/2.0 H/ H/1.0 cluster/ @@ -959,7 +963,7 @@ Lmod has detected the following error: You must pick a cluster step 78 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D H/1.0 =========================== -Access will be denied to this module starting YYYY-MM-DD +Access will be denied to this module starting 3000-01-01 =========================== step 79 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list @@ -1031,6 +1035,7 @@ The following is a list of the modules and extensions currently available: C: C/1.0, C/2.0, C/3.0 D: D/3.0 F: F/1.0 + G: G/2.0 cluster: cluster/a, cluster/b, cluster/c hard: hard/1.0 To learn more about a package execute: @@ -1047,6 +1052,7 @@ The following is a list of the modules and extensions currently available: C: C/1.0, C/2.0, C/3.0 D: D/3.0 F: F/1.0 + G: G/1.0, G/2.0 H: H/1.0 cluster: cluster/a, cluster/b, cluster/c, cluster/.defaultCluster hard: hard/1.0 @@ -1068,6 +1074,8 @@ D/ D/3.0 F/ F/1.0 +G/ +G/2.0 cluster/ cluster/a cluster/b @@ -1086,6 +1094,9 @@ D/ D/3.0 F/ F/1.0 +G/ +G/1.0 +G/2.0 H/ H/1.0 cluster/ @@ -1100,9 +1111,10 @@ step 87 lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail =========================== ProjectDIR/rt/modulerc/mfD/Core - C/1.0 D/3.0 (NF,L) cluster/a cluster/.defaultCluster (H,F,D) - C/2.0 F/1.0 (NF) cluster/b hard/1.0 - C/3.0 (F,D) H/1.0 (s,L) cluster/c + C/1.0 F/1.0 (NF) cluster/a hard/1.0 + C/2.0 G/1.0 (H) cluster/b + C/3.0 (F,D) G/2.0 (D) cluster/c + D/3.0 (NF,L) H/1.0 (s,L) cluster/.defaultCluster (H,F,D) Where: D: Default Module F: Forbidden Module diff --git a/rt/modulerc/mfD/Core/G/.modulerc.lua b/rt/modulerc/mfD/Core/G/.modulerc.lua new file mode 100644 index 000000000..324cc53f9 --- /dev/null +++ b/rt/modulerc/mfD/Core/G/.modulerc.lua @@ -0,0 +1,2 @@ +local MROOT=os.getenv("MODULEPATH_ROOT") +hide{name=pathJoin(MROOT,"Core/G","1.0")} diff --git a/rt/modulerc/mfD/Core/G/1.0.lua b/rt/modulerc/mfD/Core/G/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfD/Core/G/2.0.lua b/rt/modulerc/mfD/Core/G/2.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfD/Core/hardAll/.modulerc.lua b/rt/modulerc/mfD/Core/hardAll/.modulerc.lua index 6b907239e..6ef9537c8 100644 --- a/rt/modulerc/mfD/Core/hardAll/.modulerc.lua +++ b/rt/modulerc/mfD/Core/hardAll/.modulerc.lua @@ -1,2 +1 @@ -hide{name="hardAll/1.0",kind="hard"} -hide{name="hardAll/2.0",kind="hard"} +hide{name="hardAll",kind="hard"} diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt index f52996bd3..520bdeee3 100644 --- a/rt/modulerc/out.txt +++ b/rt/modulerc/out.txt @@ -206,11 +206,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/modulerc/mf/Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/modulerc/mf/Core"] = { alias2modT = { @@ -855,11 +850,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/modulerc/mf6:ProjectDIR/rt/modulerc/mf7:Pr timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/modulerc/mf6"] = { version2modT = { @@ -1060,11 +1050,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/modulerc/mf7:ProjectDIR/rt/modulerc/mf6:Pr timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/modulerc/mf6"] = { version2modT = { @@ -1454,11 +1439,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/modulerc/mfB/Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/modulerc/mfB/Core"] = { hiddenT = { @@ -2171,48 +2151,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/modulerc/mfD/Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = { - ["ACME/1.0"] = { - action = "hide", - after = "YYYY-MM-DDTHH:mm", - kind = "hidden", - name = "ACME/1.0", - }, - ["ACME/2.0"] = { - action = "hide", - after = "YYYY-MM-DDTHH:mm", - kind = "hidden", - name = "ACME/2.0", - }, - ["ACME/3.0"] = { - action = "hide", - before = "YYYY-MM-DDTHH:mm", - kind = "hidden", - name = "ACME/3.0", - }, - ["ACME/4.0"] = { - action = "hide", - before = "YYYY-MM-DDTHH:mm", - kind = "hidden", - name = "ACME/4.0", - }, - ["B/1.0"] = { - action = "hide", - after = "YYYY-MM-DDTHH:mm", - kind = "hard", - name = "B/1.0", - }, - ["B/2.0"] = { - action = "hide", - after = "YYYY-MM-DDTHH:mm", - kind = "hard", - name = "B/2.0", - }, - }, - version2modT = {}, -} mrcMpathT = { ["ProjectDIR/rt/modulerc/mfD/Core"] = { forbiddenT = { @@ -2237,6 +2175,11 @@ mrcMpathT = { }, }, hiddenT = { + ["ProjectDIR/rt/modulerc/mfD/Core/G/1.0"] = { + action = "hide", + kind = "hidden", + name = "ProjectDIR/rt/modulerc/mfD/Core/G/1.0", + }, ["ABC/3.0"] = { action = "hide", kind = "soft", @@ -2268,15 +2211,10 @@ mrcMpathT = { lmodTestUser = true, }, }, - ["hardAll/1.0"] = { - action = "hide", - kind = "hard", - name = "hardAll/1.0", - }, - ["hardAll/2.0"] = { + hardAll = { action = "hide", kind = "hard", - name = "hardAll/2.0", + name = "hardAll", }, }, }, @@ -2437,6 +2375,49 @@ spiderT = { }, }, }, + G = { + defaultA = { + { + barefn = ".modulerc.lua", + defaultIdx = 2, + fn = "ProjectDIR/rt/modulerc/mfD/Core/G/.modulerc.lua", + fullName = "G/.modulerc", + luaExt = 10, + mpath = "ProjectDIR/rt/modulerc/mfD/Core", + value = false, + }, + }, + defaultT = { + barefn = ".modulerc.lua", + defaultIdx = 2, + fn = "ProjectDIR/rt/modulerc/mfD/Core/G/.modulerc.lua", + fullName = "G/.modulerc", + luaExt = 10, + mpath = "ProjectDIR/rt/modulerc/mfD/Core", + value = false, + }, + dirT = {}, + fileT = { + ["G/1.0"] = { + Version = "1.0", + canonical = "1.0", + fn = "ProjectDIR/rt/modulerc/mfD/Core/G/1.0.lua", + luaExt = 4, + mpath = "ProjectDIR/rt/modulerc/mfD/Core", + pV = "000000001.*zfinal", + wV = "000000001.*zfinal", + }, + ["G/2.0"] = { + Version = "2.0", + canonical = "2.0", + fn = "ProjectDIR/rt/modulerc/mfD/Core/G/2.0.lua", + luaExt = 4, + mpath = "ProjectDIR/rt/modulerc/mfD/Core", + pV = "000000002.*zfinal", + wV = "000000002.*zfinal", + }, + }, + }, H = { defaultA = { { diff --git a/rt/rmap/err.txt b/rt/rmap/err.txt index 79aa1bad5..c1b14629c 100644 --- a/rt/rmap/err.txt +++ b/rt/rmap/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.32 2023-08-28 12:42 -05: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/rmap/out.txt b/rt/rmap/out.txt index 7de34d86e..9d198043c 100644 --- a/rt/rmap/out.txt +++ b/rt/rmap/out.txt @@ -9,11 +9,6 @@ buildSpiderT ProjectDIR/rt/rmap/mf/Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/rmap/mf/Compiler/intel/13.1"] = { @@ -344,11 +339,6 @@ buildSpiderT ProjectDIR/rt/rmap/mf/2Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/rmap/mf/2Compiler/intel/14.0"] = { @@ -502,11 +492,6 @@ buildSpiderT ProjectDIR/rt/rmap/mf/2Core timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/rmap/mf/2Compiler/intel/14.0"] = { diff --git a/rt/softwarePage/err.txt b/rt/softwarePage/err.txt index 49a48cc2c..fe538eccc 100644 --- a/rt/softwarePage/err.txt +++ b/rt/softwarePage/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.48 2024-08-19 16:18 -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/softwarePage/out.txt b/rt/softwarePage/out.txt index bfbae1979..1f2b430fb 100644 --- a/rt/softwarePage/out.txt +++ b/rt/softwarePage/out.txt @@ -19,11 +19,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/softwarePage/mf timestampFn = { false, } -mrcT = { - alias2modT = {}, - hiddenT = {}, - version2modT = {}, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/softwarePage/mf"] = { diff --git a/rt/spider/err.txt b/rt/spider/err.txt index 05a886b5a..4f18a70f7 100644 --- a/rt/spider/err.txt +++ b/rt/spider/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.47 2024-07-22 10:04 -04: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/spider/out.txt b/rt/spider/out.txt index aca1c0df0..24d0b9381 100644 --- a/rt/spider/out.txt +++ b/rt/spider/out.txt @@ -261,20 +261,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf/E_Core timestampFn = { false, } -mrcT = { - alias2modT = { - intelcompiler = "intel", - }, - hiddenT = { - ["gcc/4.8"] = { - kind = "hidden", - }, - }, - version2modT = { - ["intel/17"] = "intel/2017.1.132", - ["intel/2017"] = "intel/2017.1.132", - }, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/spider/mf/E_Compiler/gcc/4.2"] = { @@ -897,20 +883,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf/G_Core timestampFn = { false, } -mrcT = { - alias2modT = { - intelcompiler = "intel", - }, - hiddenT = { - ["gcc/4.8"] = { - kind = "hidden", - }, - }, - version2modT = { - ["intel/17"] = "intel/2017.1.132", - ["intel/2017"] = "intel/2017.1.132", - }, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/spider/mf/G_Core"] = { @@ -941,20 +913,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf/H_Core timestampFn = { false, } -mrcT = { - alias2modT = { - intelcompiler = "intel", - }, - hiddenT = { - ["gcc/4.8"] = { - kind = "hidden", - }, - }, - version2modT = { - ["intel/17"] = "intel/2017.1.132", - ["intel/2017"] = "intel/2017.1.132", - }, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/spider/mf/H_Core"] = { @@ -1090,20 +1048,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf/I_Core timestampFn = { false, } -mrcT = { - alias2modT = { - intelcompiler = "intel", - }, - hiddenT = { - ["gcc/4.8"] = { - kind = "hidden", - }, - }, - version2modT = { - ["intel/17"] = "intel/2017.1.132", - ["intel/2017"] = "intel/2017.1.132", - }, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/spider/mf/I_Core"] = { @@ -1218,20 +1162,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/spider/mf2/Core timestampFn = { false, } -mrcT = { - alias2modT = { - intelcompiler = "intel", - }, - hiddenT = { - ["gcc/4.8"] = { - kind = "hidden", - }, - }, - version2modT = { - ["intel/17"] = "intel/2017.1.132", - ["intel/2017"] = "intel/2017.1.132", - }, -} mrcMpathT = {} spiderT = { ["ProjectDIR/rt/spider/mf2/Compiler/gcc/10"] = { diff --git a/src/Cache.lua b/src/Cache.lua index 32bd2d437..cbc6caa86 100644 --- a/src/Cache.lua +++ b/src/Cache.lua @@ -337,12 +337,11 @@ local function l_readCacheFile(self, mpathA, spiderTFnA) end resultFunc() --> Finish the loadfile() - if (_G.mrcT == nil or next(_G.mrcT) == nil or - _G.mrcMpathT == nil) then + if (_G.mrcMpathT == nil) then LmodError{msg="e_BrokenCacheFn",fn=fn} end - mrc:import(_G.mrcT, _G.mrcMpathT) + mrc:import(_G.mrcMpathT) local G_spiderT = _G.spiderT for k, v in pairs(G_spiderT) do diff --git a/src/MRC.lua b/src/MRC.lua index ea7794f31..be14d8a84 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -454,10 +454,10 @@ end function M.export(self) local t, mrcMpathT = self:extract() local a = {} - a[1] = serializeTbl{indent = true, name = "mrcT", value = t } - a[2] = serializeTbl{indent = true, name = "mrcMpathT", value = mrcMpathT } - return concatTbl(a,"\n") - --return serializeTbl{indent = true, name = "mrcMpathT", value = mrcMpathT } + --a[1] = serializeTbl{indent = true, name = "mrcT", value = t } + --a[2] = serializeTbl{indent = true, name = "mrcMpathT", value = mrcMpathT } + --return concatTbl(a,"\n") + return serializeTbl{indent = true, name = "mrcMpathT", value = mrcMpathT } end @@ -498,10 +498,7 @@ local function l_findHiddenState(self, mpathA, sn, fullName, fn) self.__merged_hiddenT = l_merge_tables(self, "hiddenT", mpathA, {kind = "hidden"}) end local t = self.__merged_hiddenT - local resultT = t[sn] or t[fullName] or t[fn] - - ------------------------------------------------------------ - -- If there is no result for sn, fullName or fn + local resultT = t[sn] or t[fullName] or (fn and (t[fn] or t[fn:gsub("%.lua$","")])) -- then check for partial matches for NVV modulefiles. if (not resultT) then local _ @@ -523,7 +520,7 @@ local function l_findForbiddenState(self, mpathA, sn, fullName, fn) self.__merged_forbiddenT = l_merge_tables(self, "forbiddenT", mpathA, nil) end local t = self.__merged_forbiddenT - local resultT = t[sn] or t[fullName] or t[fn] + local resultT = t[sn] or t[fullName] or (fn and (t[fn] or t[fn:gsub("%.lua$","")])) ------------------------------------------------------------ -- If there is no result for sn, fullName or fn -- then check for partial matches for NVV modulefiles. @@ -539,19 +536,19 @@ local function l_findForbiddenState(self, mpathA, sn, fullName, fn) return resultT or {} end -local function l_import_helper(self,entryT) - if (entryT and next(entryT) ~= nil) then - for kk,vv in pairs(entryT) do - local key = "__" .. kk - local t = self[key] - for k,v in pairs(vv) do - t[k] = v - end - end - end -end +--local function l_import_helper(self,entryT) +-- if (entryT and next(entryT) ~= nil) then +-- for kk,vv in pairs(entryT) do +-- local key = "__" .. kk +-- local t = self[key] +-- for k,v in pairs(vv) do +-- t[k] = v +-- end +-- end +-- end +--end -function M.import(self, mrcT, mrcMpathT) +function M.import(self, mrcMpathT) --dbg.start{"MRC:import()"} --dbg.print{"mrcMpathT :",mrcMpathT,"\n"} if (mrcMpathT and next(mrcMpathT) ~= nil) then @@ -563,7 +560,7 @@ function M.import(self, mrcT, mrcMpathT) end end end - l_import_helper(self, mrcT) + self:update() --dbg.fini("MRC:import") end