Issue #613: have setenv call setenv_env for modes: Access, ComputeHas…

…h, DependencyCk and Refresh
TACC · Dec 19, 2022 · 37e70dc · 37e70dc
1 parent 960ebf4
commit 37e70dc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/rt/show/out.txt b/rt/show/out.txt
@@ -28,7 +28,6 @@ MODULEPATH=ProjectDIR/rt/show/mf/Core;
 export MODULEPATH;
 _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/show/mf/Core",},systemBaseMPATH="ProjectDIR/rt/show/mf/Core",}';
 export _ModuleTable_;
-false
 ===========================
 step 5
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing show boost

diff --git a/src/MC_Access.lua b/src/MC_Access.lua
@@ -131,11 +131,11 @@ M.myModuleVersion      = MainControl.myModuleVersion
 M.prepend_path         = MainControl.quiet
 M.prereq               = MainControl.quiet
 M.prereq_any           = MainControl.quiet
-M.pushenv              = MainControl.quiet
+M.pushenv              = MainControl.setenv_env
 M.remove_path          = MainControl.quiet
 M.remove_property      = MainControl.quiet
 M.report               = MainControl.warning
-M.setenv               = MainControl.quiet
+M.setenv               = MainControl.setenv_env
 M.set_alias            = MainControl.quiet
 M.set_shell_function   = MainControl.quiet
 M.source_sh            = MainControl.quiet

diff --git a/src/MC_ComputeHash.lua b/src/MC_ComputeHash.lua
@@ -88,13 +88,13 @@ M.myModuleUsrName      = MainControl.myModuleUsrName
 M.myModuleVersion      = MainControl.myModuleVersion
 M.prereq               = MainControl.quiet
 M.prereq_any           = MainControl.quiet
-M.pushenv              = MainControl.quiet
+M.pushenv              = MainControl.setenv_env
 M.remove_property      = MainControl.quiet
 M.report               = MainControl.quiet
 M.set_alias            = MainControl.quiet
 M.set_shell_function   = MainControl.quiet
 M.source_sh            = MainControl.quiet
-M.setenv               = MainControl.quiet
+M.setenv               = MainControl.setenv_env
 M.uncomplete           = MainControl.quiet
 M.unset_alias          = MainControl.quiet
 M.unset_alias          = MainControl.quiet

diff --git a/src/MC_DependencyCk.lua b/src/MC_DependencyCk.lua
@@ -77,10 +77,10 @@ M.prepend_path         = MainControl.quiet
 M.prereq               = MainControl.quiet
 M.prereq_any           = MainControl.quiet
 M.pushenv              = MainControl.quiet
-M.remove_path          = MainControl.quiet
+M.remove_path          = MainControl.setenv_env
 M.remove_property      = MainControl.quiet
 M.report               = MainControl.quiet
-M.setenv               = MainControl.quiet
+M.setenv               = MainControl.setenv_env
 M.set_alias            = MainControl.quiet
 M.set_shell_function   = MainControl.quiet
 M.source_sh            = MainControl.quiet

diff --git a/src/MC_Refresh.lua b/src/MC_Refresh.lua
@@ -78,11 +78,11 @@ M.myModuleVersion      = MainControl.myModuleVersion
 M.prepend_path         = MainControl.quiet
 M.prereq               = MainControl.quiet
 M.prereq_any           = MainControl.quiet
-M.pushenv              = MainControl.quiet
+M.pushenv              = MainControl.setenv_env
 M.remove_path          = MainControl.quiet
 M.remove_property      = MainControl.quiet
 M.report               = MainControl.quiet
-M.setenv               = MainControl.quiet
+M.setenv               = MainControl.setenv_env
 M.set_alias            = MainControl.set_alias
 M.set_shell_function   = MainControl.set_shell_function
 M.source_sh            = MainControl.source_sh

diff --git a/src/MainControl.lua b/src/MainControl.lua
@@ -1,3 +1,6 @@
+_G._DEBUG             = false               -- Required by the new lua posix
+local posix           = require("posix")
+
 require("strict")
 
 --------------------------------------------------------------------------
@@ -328,6 +331,18 @@ function M.setenv(self, name, value, respect)
 end
 
 
+-------------------------------------------------------------------
+-- Set an environment variable.
+-- This function just sets the name with value in the current env.
+function M.setenv_env(self, name, value, respect)
+   name = name:trim()
+   dbg.start{"MainControl:setenv_env(\"",name,"\", \"",value,"\", \"",
+              respect,"\")"}
+   posix.setenv(name, value, true)
+   dbg.fini("MainControl:setenv_env")
+end
+
+
 --------------------------------------------------------------------------
 -- Unset an environment variable.
 -- @param self A MainControl object.