Skip to content

Commit 1bc8036

Browse files
committed
Merge branch 'irreversible' of github.com:TACC/Lmod into irreversible
2 parents 4890479 + 293442c commit 1bc8036

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

rt/mode_select/mode_select.tdesc

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ testdescript = {
6464
runLmod purge #16
6565
6666
# Test Mixed Unload Operations
67-
runLmod load mixed_unload_test #17 (Test unload-specific operations)
68-
runLmod list #18 (Verify initial state)
67+
runLmod load mixed_unload_test #17 (Test unload-specific operations)
68+
runLmod list #18 (Verify initial state)
6969
runLmod unload mixed_unload_test #19 (Test unload behavior)
7070
runLmod list #20 (Verify final state)
7171
runLmod purge #21
@@ -76,8 +76,8 @@ testdescript = {
7676
runLmod unload mixed_both_test #24 (Test dual-mode operations during unload)
7777
runLmod list #25 (Verify final state)
7878
79-
runLmod load forbidden_env_test #26 (Test forbidden env var check: should raise error and not load)
80-
runLmod load invalid_key_test #27 (Test invalid func key check: should raise error and not load)
79+
runLmod load forbidden_env_test #26 (Test forbidden env var check: should raise error and not load)
80+
runLmod load invalid_key_test #27 (Test invalid func key check: should raise error and not load)
8181
8282
8383
HOME=$ORIG_HOME

src/modfuncs.lua

+6
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,12 @@ local function l_checkForbiddenEnv(argT)
197197
if (not argT.modeA or type(argT.modeA) ~= "table" or #argT.modeA == 0) then
198198
return true
199199
end
200+
--if (argT.modeA and type(argT.modeA) == "table" and #argT.modeA == 1 and argT.modeA[1] == "normal") then
201+
-- return true
202+
--end
203+
if (#argT.modeA == 1 and argT.modeA[1] == "normal") then
204+
return true
205+
end
200206

201207
-- Check if the target variable is in the list of forbidden keys.
202208
local forbiddenKeys = { MODULEPATH = true }

0 commit comments

Comments
 (0)