Skip to content

Commit 6528e54

Browse files
committed
Update mod designation with tags set by DepRe modules
Update module designation with the tags set by reloading dependent module. Closes #460.
1 parent f907194 commit 6528e54

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

NEWS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Modules 5.1.1 (not yet released)
2626
retrieved due to the removal of this directory. (fix issue #457)
2727
* Update tags set through :mfcmd:`prereq` command on all already loaded
2828
requirements. (fix issue #459)
29+
* Update module designation with the tags set by reloading dependent module.
30+
(fix issue #460)
2931

3032

3133
Modules 5.1.0 (2022-04-30)

tcl/subcmd.tcl.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,10 +1107,6 @@ proc cmdModuleLoad {context uasked tag_list args} {
11071107
append-path __MODULES_LMEXTRATAG $modtag
11081108
}
11091109

1110-
# record module title (name, variants and tags)
1111-
registerModuleDesignation $msgrecid $modname [getVariantList\
1112-
$modname 1] [getExportTagList $modname]
1113-
11141110
# Load phase of dependent module reloading. These modules can adapt
11151111
# now that mod is seen loaded. Except if switch action ongoing (DepRe
11161112
# load phase will occur from switch)
@@ -1121,6 +1117,10 @@ proc cmdModuleLoad {context uasked tag_list args} {
11211117
failed} depre
11221118
}
11231119

1120+
# record module title (name, variants and tags)
1121+
registerModuleDesignation $msgrecid $modname [getVariantList\
1122+
$modname 1] [getExportTagList $modname]
1123+
11241124
# consider evaluation hidden if hidden loaded module is auto loaded
11251125
# and no specific messages are recorded for this evaluation
11261126
if {$hidden && !$uasked && ![isMsgRecorded]} {

testsuite/modules.50-cmds/465-tag-opt.exp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,7 @@ lappend ans [list set _LMFILES_ $mp/foo/1.0:$mp/bar/1.0:$modfile]
753753
lappend ans [list set LOADEDMODULES foo/1.0:bar/1.0:$mod]
754754
lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&foo:bar/1.0&foo]
755755
lappend ans [list set __MODULES_LMTAG foo/1.0&foo&auto-loaded:bar/1.0&foo]
756-
#FIXME: tag applied by DepRe reloading module does not appear on info messages
757-
set tserr [msg_top_load bar/1.0 {} {} $mod]
756+
set tserr [msg_top_load {bar/1.0 <foo>} {} {} $mod]
758757
testouterr_cmd sh "load --auto bar/1.0" $ans $tserr
759758

760759
# both requirement loaded, but not tagged

0 commit comments

Comments
 (0)