envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-14 00:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Same special treatment for reset than restore subcmd

Browse Source 
Reports loads/unloads like restore sub-command. No auto unload of
modules if auto_handling is disabled.
This commit is contained in:
Xavier Delaruelle
2022-08-15 08:37:39 +02:00
parent 3af1371adf
commit 966fb6f50f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tcl/main.tcl.in
View File

@@ -493,10 +493,10 @@ proc module {command args} {
}
# mods unload is handled via UReqUn mechanism when auto enabled
# (unless if implicit_requirement has been inhibited) also unloads
# are triggered by ongoing reload, purge or restore commands
# are triggered by ongoing reload, purge, restore or reset cmds
} elseif {(![getConf auto_handling] || [getState\
inhibit_req_record] eq [currentState evalid]) &&\
[aboveCommandName] ni [list purge reload restore]} {
[aboveCommandName] ni [list purge reload restore reset]} {
# on unload mode, unload mods in reverse order, if loaded
# prior this mod, if not user asked and not required by
# other loaded mods
@@ -589,11 +589,11 @@ proc module {command args} {
# module. If auto handling is enabled switched-on module
# is handled via UReqUn mechanism (unless if
# implicit_requirement has been inhibited). Also unloads are
# triggered by ongoing reload, purge or restore commands
# triggered by ongoing reload, purge, restore or reset cmds
if {(![getConf auto_handling] || [getState\
inhibit_req_record] eq [currentState evalid]) &&\
$swlomod ne {} && [aboveCommandName] ni [list purge\
reload restore]} {
reload restore reset]} {
# unload mod if it was loaded prior this mod, not user
# asked and not required by another loaded module
set modlist [getLoadedModulePropertyList name]

6
tcl/report.tcl.in
View File

@@ -264,9 +264,9 @@ proc reportMsgRecord {header {hidden 0}} {
# dependency evaluations which are reported by triggering top evaluation)
# if hidden flag is enabled report only if verbosity >= verbose2
} elseif {(!$hidden && ([isVerbosityLevel verbose] || ([isVerbosityLevel\
normal] && ([ongoingCommandName restore] || [ongoingCommandName\
source]) && $recid eq [topState msgrecordid]))) || ($hidden &&\
[isVerbosityLevel verbose2])} {
normal] && ([ongoingCommandName restore] || [ongoingCommandName source]\
|| [ongoingCommandName reset]) && $recid eq [topState msgrecordid])))\
|| ($hidden && [isVerbosityLevel verbose2])} {
report $header
}
}