diff --git a/rt/conflict/conflict.tdesc b/rt/conflict/conflict.tdesc index 81d9bb7ea..e6bfc325b 100644 --- a/rt/conflict/conflict.tdesc +++ b/rt/conflict/conflict.tdesc @@ -74,8 +74,11 @@ testdescript = { runLmod unload acme #41 runLmod load D/1.3 #42 runLmod list #43 - runLmod load G/3.1.4 #44 - runLmod load G/3.1.5 #45 + runLmod unload D #44 + runLmod load acme #45 + runLmod load G/3.1.4 #46 + runLmod load G/3.1.5 #47 + runLmod list #48 diff --git a/rt/conflict/err.txt b/rt/conflict/err.txt index 402673655..ac57de566 100644 --- a/rt/conflict/err.txt +++ b/rt/conflict/err.txt @@ -80,36 +80,59 @@ While processing the following module(s): y/1.0 ProjectDIR/rt/conflict/mf/y/1.0.lua =========================== step 14 -lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load e/1.0 =========================== =========================== step 15 -lua ProjectDIR/src/lmod.in.lua shell --regression_testing load base acme +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load cc =========================== +Lmod has detected the following error: Cannot load module "cc" because these module(s) are loaded: + e/1.0 +While processing the following module(s): + Module fullname Module Filename + cc ProjectDIR/rt/conflict/mf/cc.lua =========================== step 16 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load e/2.0 +=========================== +The following have been reloaded with a version change: + 1) e/1.0 => e/2.0 +=========================== +step 17 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load cc +=========================== +=========================== +step 18 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +=========================== +step 19 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load base acme +=========================== +=========================== +step 20 lua ProjectDIR/src/lmod.in.lua shell --regression_testing save =========================== Saved current collection of modules to: "default" =========================== -step 17 +step 21 lua ProjectDIR/src/lmod.in.lua shell --regression_testing restore =========================== Restoring modules from user's default =========================== -step 18 +step 22 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme =========================== =========================== -step 19 +step 23 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload base =========================== =========================== -step 20 +step 24 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== =========================== -step 21 +step 25 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== Lmod has detected the following error: Cannot load module "acme/1.0" because these module(s) are loaded: @@ -118,92 +141,130 @@ While processing the following module(s): Module fullname Module Filename acme/1.0 ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua =========================== -step 22 +step 26 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.1 =========================== The following have been reloaded with a version change: 1) D/1.3 => D/1.1 =========================== -step 23 +step 27 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== =========================== -step 24 +step 28 lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge =========================== =========================== -step 25 +step 29 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== =========================== -step 26 +step 30 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.1 =========================== =========================== -step 27 +step 31 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/3.2 =========================== The following have been reloaded with a version change: 1) D/1.1 => D/3.2 =========================== -step 28 +step 32 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== Lmod has detected the following error: Cannot load module "D/1.3" because this module set a conflict: "acme/1.0" +While processing the following module(s): + Module fullname Module Filename + D/1.3 ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua =========================== -step 29 +step 33 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: 1) acme/1.0 2) D/3.2 =========================== -step 30 +step 34 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load E =========================== Lmod has detected the following error: Cannot load module "E" because this module set a conflict: "acme/1.0" +While processing the following module(s): + Module fullname Module Filename + E/3.3 ProjectDIR/rt/conflict/mf2/Core/E/3.3.lua =========================== -step 31 +step 35 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load E/3.3 =========================== Lmod has detected the following error: Cannot load module "E/3.3" because this module set a conflict: "acme/1.0" +While processing the following module(s): + Module fullname Module Filename + E/3.3 ProjectDIR/rt/conflict/mf2/Core/E/3.3.lua =========================== -step 32 +step 36 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: 1) acme/1.0 2) D/3.2 =========================== -step 33 +step 37 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F =========================== =========================== -step 34 +step 38 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F/4.1.4 =========================== =========================== -step 35 +step 39 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F/3.1.4 =========================== Lmod has detected the following error: Cannot load module "F/3.1.4" because this module set a conflict: "acme/1.0" +While processing the following module(s): + Module fullname Module Filename + F/3.1.4 ProjectDIR/rt/conflict/mf2/Core/F/3.1.4.lua =========================== -step 36 +step 40 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: 1) acme/1.0 2) D/3.2 3) F/4.1.4 =========================== -step 37 +step 41 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme =========================== =========================== -step 38 +step 42 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== The following have been reloaded with a version change: 1) D/3.2 => D/1.3 =========================== -step 39 +step 43 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: 1) F/4.1.4 2) D/1.3 +=========================== +step 44 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload D +=========================== +=========================== +step 45 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme +=========================== +=========================== +step 46 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load G/3.1.4 +=========================== +Lmod has detected the following error: Cannot load module "G/3.1.4" because this module set a conflict: "acme/1.0" +While processing the following module(s): + Module fullname Module Filename + G/3.1.4 ProjectDIR/rt/conflict/mf2/Core/G/3.1.4.lua +=========================== +step 47 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load G/3.1.5 +=========================== +=========================== +step 48 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +Currently Loaded Modules: + 1) F/4.1.4 2) acme/1.0 3) G/3.1.5 diff --git a/rt/conflict/mf2/Core/G/3.1.4.lua b/rt/conflict/mf2/Core/G/3.1.4.lua new file mode 100644 index 000000000..aad8e8c76 --- /dev/null +++ b/rt/conflict/mf2/Core/G/3.1.4.lua @@ -0,0 +1 @@ +setenv("G",myModuleVersion()) diff --git a/rt/conflict/mf2/Core/G/3.1.5.lua b/rt/conflict/mf2/Core/G/3.1.5.lua new file mode 100644 index 000000000..aad8e8c76 --- /dev/null +++ b/rt/conflict/mf2/Core/G/3.1.5.lua @@ -0,0 +1 @@ +setenv("G",myModuleVersion()) diff --git a/rt/conflict/out.txt b/rt/conflict/out.txt index 4f15e4d9b..bace01b0d 100644 --- a/rt/conflict/out.txt +++ b/rt/conflict/out.txt @@ -124,6 +124,51 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing load y false =========================== step 14 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load e/1.0 +=========================== +LOADEDMODULES=a:b:d/1.0:f:x/1.5:e/1.0; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf/a.lua:ProjectDIR/rt/conflict/mf/b.lua:ProjectDIR/rt/conflict/mf/d/1.0.lua:ProjectDIR/rt/conflict/mf/f.lua:ProjectDIR/rt/conflict/mf/x/1.5.lua:ProjectDIR/rt/conflict/mf/e/1.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={a={fn="ProjectDIR/rt/conflict/mf/a.lua",fullName="a",loadOrder=1,propT={},stackDepth=0,status="active",userName="a",wV="M.*zfinal",},b={fn="ProjectDIR/rt/conflict/mf/b.lua",fullName="b",loadOrder=2,propT={},stackDepth=0,status="active",userName="b",wV="M.*zfinal",},d={fn="ProjectDIR/rt/conflict/mf/d/1.0.lua",fullName="d/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName="d",wV="000000001.*zfinal",},e={fn="ProjectDIR/rt/conflict/mf/e/1.0.lua",fullName="e/1.0",loadOrder=6,propT={},stackDepth=0,status="active",userName="e/1.0",wV="000000001.*zfinal",},f={fn="ProjectDIR/rt/conflict/mf/f.lua",fullName="f",loadOrder=4,propT={},stackDepth=0,status="active",userName="f",wV="M.*zfinal",},x={fn="ProjectDIR/rt/conflict/mf/x/1.5.lua",fullName="x/1.5",loadOrder=5,propT={},stackDepth=0,status="active",userName="x/1.5",wV="000000001.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf",},systemBaseMPATH="ProjectDIR/rt/conflict/mf",}'; +export _ModuleTable_; +e=1.0; +export e; +=========================== +step 15 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load cc +=========================== +false +=========================== +step 16 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load e/2.0 +=========================== +LOADEDMODULES=a:b:d/1.0:f:x/1.5:e/2.0; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf/a.lua:ProjectDIR/rt/conflict/mf/b.lua:ProjectDIR/rt/conflict/mf/d/1.0.lua:ProjectDIR/rt/conflict/mf/f.lua:ProjectDIR/rt/conflict/mf/x/1.5.lua:ProjectDIR/rt/conflict/mf/e/2.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={a={fn="ProjectDIR/rt/conflict/mf/a.lua",fullName="a",loadOrder=1,propT={},stackDepth=0,status="active",userName="a",wV="M.*zfinal",},b={fn="ProjectDIR/rt/conflict/mf/b.lua",fullName="b",loadOrder=2,propT={},stackDepth=0,status="active",userName="b",wV="M.*zfinal",},d={fn="ProjectDIR/rt/conflict/mf/d/1.0.lua",fullName="d/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName="d",wV="000000001.*zfinal",},e={fn="ProjectDIR/rt/conflict/mf/e/2.0.lua",fullName="e/2.0",loadOrder=6,propT={},stackDepth=0,status="active",userName="e/2.0",wV="000000002.*zfinal",},f={fn="ProjectDIR/rt/conflict/mf/f.lua",fullName="f",loadOrder=4,propT={},stackDepth=0,status="active",userName="f",wV="M.*zfinal",},x={fn="ProjectDIR/rt/conflict/mf/x/1.5.lua",fullName="x/1.5",loadOrder=5,propT={},stackDepth=0,status="active",userName="x/1.5",wV="000000001.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf",},systemBaseMPATH="ProjectDIR/rt/conflict/mf",}'; +export _ModuleTable_; +e=2.0; +export e; +=========================== +step 17 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load cc +=========================== +LOADEDMODULES=a:b:d/1.0:f:x/1.5:e/2.0:cc; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf/a.lua:ProjectDIR/rt/conflict/mf/b.lua:ProjectDIR/rt/conflict/mf/d/1.0.lua:ProjectDIR/rt/conflict/mf/f.lua:ProjectDIR/rt/conflict/mf/x/1.5.lua:ProjectDIR/rt/conflict/mf/e/2.0.lua:ProjectDIR/rt/conflict/mf/cc.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={a={fn="ProjectDIR/rt/conflict/mf/a.lua",fullName="a",loadOrder=1,propT={},stackDepth=0,status="active",userName="a",wV="M.*zfinal",},b={fn="ProjectDIR/rt/conflict/mf/b.lua",fullName="b",loadOrder=2,propT={},stackDepth=0,status="active",userName="b",wV="M.*zfinal",},cc={fn="ProjectDIR/rt/conflict/mf/cc.lua",fullName="cc",loadOrder=7,propT={},stackDepth=0,status="active",userName="cc",wV="M.*zfinal",},d={fn="ProjectDIR/rt/conflict/mf/d/1.0.lua",fullName="d/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName="d",wV="000000001.*zfinal",},e={fn="ProjectDIR/rt/conflict/mf/e/2.0.lua",fullName="e/2.0",loadOrder=6,propT={},stackDepth=0,status="active",userName="e/2.0",wV="000000002.*zfinal",},f={fn="ProjectDIR/rt/conflict/mf/f.lua",fullName="f",loadOrder=4,propT={},stackDepth=0,status="active",userName="f",wV="M.*zfinal",},x={fn="ProjectDIR/rt/conflict/mf/x/1.5.lua",fullName="x/1.5",loadOrder=5,propT={},stackDepth=0,status="active",userName="x/1.5",wV="000000001.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf",},systemBaseMPATH="ProjectDIR/rt/conflict/mf",}'; +export _ModuleTable_; +=========================== +step 18 lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge =========================== unset LOADEDMODULES; @@ -137,7 +182,7 @@ _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"Pro export _ModuleTable_; unset e; =========================== -step 15 +step 19 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load base acme =========================== LOADEDMODULES=base/1.0:acme/1.0; @@ -148,28 +193,28 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua:ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 16 +step 20 lua ProjectDIR/src/lmod.in.lua shell --regression_testing save =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 17 +step 21 lua ProjectDIR/src/lmod.in.lua shell --regression_testing restore =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; __LMOD_DEFAULT_MODULES_LOADED__=1; export __LMOD_DEFAULT_MODULES_LOADED__; =========================== -step 18 +step 22 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme =========================== LOADEDMODULES=base/1.0; @@ -181,7 +226,7 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,conflictT={base={{action="match",ie=false,is=false,sType="mt",userName="A",},{action="match",ie=false,is=false,sType="mt",userName="B",},},},depthT={},family={},mT={base={fn="ProjectDIR/rt/conflict/mf2/Core/base/1.0.lua",fullName="base/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="base",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 19 +step 23 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload base =========================== unset LOADEDMODULES; @@ -191,7 +236,7 @@ unset _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 20 +step 24 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== D=1.3; @@ -205,12 +250,12 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua",fullName="D/1.3",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/1.3",wV="000000001.000000003.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 21 +step 25 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== false =========================== -step 22 +step 26 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.1 =========================== D=1.1; @@ -224,7 +269,7 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua",fullName="D/1.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/1.1",wV="000000001.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 23 +step 27 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== LOADEDMODULES=D/1.1:acme/1.0; @@ -233,10 +278,10 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua:ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua",fullName="D/1.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/1.1",wV="000000001.000000001.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua",fullName="D/1.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/1.1",wV="000000001.000000001.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 24 +step 28 lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge =========================== unset D; @@ -247,7 +292,7 @@ unset _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 25 +step 29 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme =========================== LOADEDMODULES=acme/1.0; @@ -256,10 +301,10 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 26 +step 30 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.1 =========================== D=1.1; @@ -270,10 +315,10 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua:ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua",fullName="D/1.1",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.1",wV="000000001.000000001.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.1.lua",fullName="D/1.1",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.1",wV="000000001.000000001.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 27 +step 31 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/3.2 =========================== D=3.2; @@ -284,41 +329,41 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua:ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 28 +step 32 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== false =========================== -step 29 +step 33 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 30 +step 34 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load E =========================== false =========================== -step 31 +step 35 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load E/3.3 =========================== false =========================== -step 32 +step 36 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 33 +step 37 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F =========================== F=4.1.4; @@ -329,33 +374,33 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua:ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua:ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 34 +step 38 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F/4.1.4 =========================== F=4.1.4; export F; MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 35 +step 39 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load F/3.1.4 =========================== false =========================== -step 36 +step 40 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 37 +step 41 lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme =========================== LOADEDMODULES=D/3.2:F/4.1.4; @@ -367,7 +412,7 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=2,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 38 +step 42 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3 =========================== D=1.3; @@ -381,10 +426,62 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua",fullName="D/1.3",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.3",wV="000000001.000000003.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; =========================== -step 39 +step 43 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; export MODULEPATH; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua",fullName="D/1.3",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.3",wV="000000001.000000003.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; export _ModuleTable_; +=========================== +step 44 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload D +=========================== +unset D; +LOADEDMODULES=F/4.1.4; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +export _ModuleTable_; +=========================== +step 45 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load acme +=========================== +LOADEDMODULES=F/4.1.4:acme/1.0; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua:ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +export _ModuleTable_; +=========================== +step 46 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load G/3.1.4 +=========================== +false +=========================== +step 47 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load G/3.1.5 +=========================== +G=3.1.5; +export G; +LOADEDMODULES=F/4.1.4:acme/1.0:G/3.1.5; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua:ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua:ProjectDIR/rt/conflict/mf2/Core/G/3.1.5.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},G={fn="ProjectDIR/rt/conflict/mf2/Core/G/3.1.5.lua",fullName="G/3.1.5",loadOrder=3,propT={},stackDepth=0,status="active",userName="G/3.1.5",wV="000000003.000000001.000000005.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +export _ModuleTable_; +=========================== +step 48 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +MODULEPATH=ProjectDIR/rt/conflict/mf2/Core; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},{action="atmost",ie="<3.1.5",is=false,sType="mt",userName="G",},},},depthT={},family={},mT={F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},G={fn="ProjectDIR/rt/conflict/mf2/Core/G/3.1.5.lua",fullName="G/3.1.5",loadOrder=3,propT={},stackDepth=0,status="active",userName="G/3.1.5",wV="000000003.000000001.000000005.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}'; +export _ModuleTable_; diff --git a/src/Hub.lua b/src/Hub.lua index ef62e9ebc..76c5af3d7 100644 --- a/src/Hub.lua +++ b/src/Hub.lua @@ -318,17 +318,6 @@ function M.load(self, mA) local userName = mname:userName() mt = frameStk:mt() - dbg.print{"dsConflicts: ",dsConflicts,"\n"} - if (dsConflicts == "yes") then - local snUpstream = mt:haveDSConflict(mname) - if (snUpstream) then - local fullNameUpstream = mt:fullName(snUpstream) - LmodError{msg="e_Conflict_Downstream", fullNameUpstream = fullNameUpstream, - userName=userName} - end - end - - dbg.print{"Hub:load i: ",i,", userName: ",userName,"\n",} local sn = mname:sn() @@ -396,6 +385,17 @@ function M.load(self, mA) frameStk:push(mname) mt = frameStk:mt() mt:add(mname,"pending") + dbg.print{"dsConflicts: ",dsConflicts,"\n"} + if (dsConflicts == "yes") then + local snUpstream = mt:haveDSConflict(mname) + if (snUpstream) then + local fullNameUpstream = mt:fullName(snUpstream) + LmodError{msg="e_Conflict_Downstream", fullNameUpstream = fullNameUpstream, + userName=userName} + end + end + + local status = loadModuleFile{file = fn, shell = shellNm, mList = mList, reportErr = true} mt = frameStk:mt() diff --git a/src/MName.lua b/src/MName.lua index d496eb5e0..e23fbfc7b 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -728,6 +728,8 @@ function M.downstreamConflictCk(self, mnameIn) local snIn = mnameIn:sn() dbg.start{"MName:downstreamConflictCk(snIn:", snIn,")"} + dbg.print{"self:userName(): ", self:userName(),"\n"} + local have_range, result = l_rangeCk(self, mnameIn:version(), mnameIn:userName(), false) if (have_range) then dbg.print{"2 result: ",result,"\n"} @@ -736,8 +738,8 @@ function M.downstreamConflictCk(self, mnameIn) end result = false - dbg.print{"self: ",self,"\n"} - dbg.print{"mnameIn: ",mnameIn,"\n"} + --dbg.print{"self: ",self,"\n"} + --dbg.print{"mnameIn: ",mnameIn,"\n"} if (self:userName() == snIn or extractVersion(self:userName(), snIn) == mnameIn:version()) then result = snIn end diff --git a/src/MT.lua b/src/MT.lua index c5821f6de..6eb8b4870 100644 --- a/src/MT.lua +++ b/src/MT.lua @@ -208,7 +208,9 @@ function M.singleton(self, t) if (not s_mt) then dbg.start{"MT:singleton()"} s_mt = l_new(self, getMT()) - dbg.printT("s_mt",s_mt) + if (dbg.active()) then + dbg.print{"s_mt: ",s_mt:serializeTbl("pretty") } + end dbg.fini("MT:singleton") end return s_mt @@ -1521,9 +1523,13 @@ function M.haveDSConflict(self, mnameIn) for i = 1,#vv do local conflict_mname = vv[i] dbg.print{"conflict_mname:userName(): ",conflict_mname:userName(),"\n"} - local snUpstream = conflict_mname:downstreamConflictCk(mnameIn) - if (snUpstream) then - return sn + local userName_in_MT = self:lookup_w_userName(conflict_mname:userName()) + dbg.print{"userName_in_MT: ",userName_in_MT,"\n"} + if (self:lookup_w_userName(conflict_mname:userName())) then + local snUpstream = conflict_mname:downstreamConflictCk(mnameIn) + if (snUpstream) then + return sn + end end end end