Skip to content

Commit

Permalink
No already loaded msg if new tag applied
Browse files Browse the repository at this point in the history
Remove the *already loaded* message displayed when verbosity level is
higher or equal to 'verbose2', if new tags are applied to the loaded
module.

Closes #456
  • Loading branch information
xdelaruelle committed May 7, 2022
1 parent 8523c2d commit 538e06c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
3 changes: 3 additions & 0 deletions NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ Modules 5.1.1 (not yet released)
environment-modules directory under ``libdir``.
* Fix rendering of loading or unloading module designation when configured
color palette does not set the ``hi`` color key. (fix issue #455)
* Remove the *already loaded* message displayed when verbosity level is higher
or equal to ``verbose2`` if new tags are applied to the loaded module. (fix
issue #456)


Modules 5.1.0 (2022-04-30)
Expand Down
12 changes: 8 additions & 4 deletions tcl/subcmd.tcl.in
Original file line number Diff line number Diff line change
Expand Up @@ -920,18 +920,19 @@ proc cmdModuleLoad {context uasked tag_list args} {
set errlocalreport 1
knerror [getModWithAltVrIsLoadedMsg $modname]
} else {
# apply missing tag to loaded module
set rettag [cmdModuleTag 0 $uasked $tag_list $modname]

# report module is already loaded if verbose2 or higher level
if {$isloaded && [isVerbosityLevel verbose2]} {
# and no new tag set
if {$isloaded && $rettag != 2 && [isVerbosityLevel verbose2]} {
reportInfo "Module '$modname' is already loaded"
registerModuleDesignation $msgrecid $modname\
[getVariantList $modname 1] [getExportTagList $modname]
reportMsgRecord "Loading [getModuleDesignation $msgrecid {}\
2]"
}

# apply missing tag to loaded module
cmdModuleTag 0 $uasked $tag_list $modname

# exit treatment but no need to restore settings
set loadok 1
continue
Expand Down Expand Up @@ -2484,6 +2485,9 @@ proc cmdModuleTag {unset_extra uasked tag_list args} {
reportMsgRecord "Tagging [getModuleDesignation $msgrecid {} 2]"\
[expr {$hidden && !$uasked}]
popMsgRecordId

# indicates that new tags have been applied
set ret 2
}
}

Expand Down
13 changes: 8 additions & 5 deletions testsuite/modules.50-cmds/465-tag-opt.exp
Original file line number Diff line number Diff line change
Expand Up @@ -1250,8 +1250,7 @@ set coll49fp $env(HOME)/home/coll49-tosource
set tserr [msg_tag {tag/8.0{-bar:+foo} <foo:H:kL>}]\n[msg_tag {foo/1.0 <aL:bar:H:kL>}]
testouterr_cmd sh "source $coll49fp" $ans {}
testouterr_cmd sh "source -v $coll49fp" $ans $tserr
#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
set tserr [msg_load variant/3.0{bar=val2} [info_alreadyloaded variant/3.0]]\n\n[msg_load {tag/8.0{-bar:+foo} <H>} [info_alreadyloaded tag/8.0]]\n\n[msg_tag {tag/8.0{-bar:+foo} <foo:H:kL>}]\n\n[msg_load {foo/1.0 <aL:H>} [info_alreadyloaded foo/1.0]]\n\n[msg_tag {foo/1.0 <aL:bar:H:kL>}]\n\n[msg_load {keep/1.0 <H>} [info_alreadyloaded keep/1.0]]
set tserr [msg_load variant/3.0{bar=val2} [info_alreadyloaded variant/3.0]]\n\n[msg_tag {tag/8.0{-bar:+foo} <foo:H:kL>}]\n[msg_tag {foo/1.0 <aL:bar:H:kL>}]\n\n[msg_load {keep/1.0 <H>} [info_alreadyloaded keep/1.0]]
testouterr_cmd sh "source -vv $coll49fp" $ans $tserr

unsetenv_var __MODULES_LMVARIANT
Expand Down Expand Up @@ -1279,13 +1278,17 @@ testouterr_cmd sh "load -vv $mod" OK $tserr
set ans [list]
lappend ans [list set __MODULES_LMEXTRATAG $mod&foo]
lappend ans [list set __MODULES_LMTAG $mod&bar&foo]
#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]]\n\n[msg_tag "$mod <bar:foo>"]
set tserr [msg_tag "$mod <bar:foo>"]
testouterr_cmd sh "load -vv --tag=foo $mod" $ans $tserr


# test module load with no new tags set on already loaded module
set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]]
testouterr_cmd sh "load -vv --tag=bar $mod" OK $tserr


unsetenv_loaded_module
unsetenv_var __MODULES_LMTAG
unsetenv_var MODULES_COLORS


#
Expand Down
6 changes: 2 additions & 4 deletions testsuite/modules.70-maint/322-tag-sgr.exp
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,10 @@ setenv_var MODULES_COLORS bar=42
set ans [list]
lappend ans [list set __MODULES_LMEXTRATAG tag/8.0&foo]
lappend ans [list set __MODULES_LMTAG tag/8.0&bar&foo]
#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
set tserr [msg_load [sgr 42]tag/8.0[sgr 0] [info_alreadyloaded tag/8.0]]\n\n[msg_tag "[sgr 42]tag/8.0[sgr 0] <foo>"]
set tserr [msg_tag "[sgr 42]tag/8.0[sgr 0] <foo>"]
testouterr_cmd_re sh "load -vv --tag=foo tag/8.0" $ans $tserr
setenv_var MODULES_COLORS bar=42:hi=1
#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
set tserr [msg_load [sgr {42;1}]tag/8.0[sgr 0] [info_alreadyloaded tag/8.0]]\n\n[msg_tag "[sgr {42;1}]tag/8.0[sgr 0] <foo>"]
set tserr [msg_tag "[sgr {42;1}]tag/8.0[sgr 0] <foo>"]
testouterr_cmd_re sh "load -vv --tag=foo tag/8.0" $ans $tserr
setenv_var MODULES_COLORS bar=42:foo=44:hi=1

Expand Down

0 comments on commit 538e06c

Please sign in to comment.