Skip to content

Commit 2e23d4f

Browse files
committed
Add provided-alias to {avail,spider}_output config
Add "provided-alias" item to avail_output and spider_output configuration options. When set, it activates *extra match search* to evaluate modulefiles and get module alias defined within them. When "provided-alias" item is set, it implies "alias" item. Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent ec54cb8 commit 2e23d4f

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

tcl/init.tcl.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ array set g_config_defs [list\
8080
auto_handling {MODULES_AUTO_HANDLING @autohandling@ 0 b {0 1}}\
8181
avail_indepth {MODULES_AVAIL_INDEPTH @availindepth@ 0 b {0 1}}\
8282
avail_output {MODULES_AVAIL_OUTPUT {@availoutput@} 0 l {modulepath alias\
83-
dirwsym indesym sym tag key hidden variant variantifspec via} {} {}\
84-
eltlist}\
83+
provided-alias dirwsym indesym sym tag key hidden variant variantifspec\
84+
via} {} {} eltlist}\
8585
avail_terse_output {MODULES_AVAIL_TERSE_OUTPUT {@availterseoutput@} 0 l\
86-
{modulepath alias dirwsym indesym sym tag key hidden variant\
87-
variantifspec} {} {} eltlist}\
86+
{modulepath alias provided-alias dirwsym indesym sym tag key hidden\
87+
variant variantifspec} {} {} eltlist}\
8888
cache_buffer_bytes {MODULES_CACHE_BUFFER_BYTES 32768 0 i {4096 1000000} {}\
8989
{} intbe}\
9090
cache_expiry_secs {MODULES_CACHE_EXPIRY_SECS 0 0 i {0 31536000} {} {}\
@@ -137,11 +137,11 @@ array set g_config_defs [list\
137137
siteconfig {{} {@etcdir@/siteconfig.tcl} 0 s}\
138138
spider_indepth {MODULES_SPIDER_INDEPTH @spiderindepth@ 0 b {0 1}}\
139139
spider_output {MODULES_SPIDER_OUTPUT {@spideroutput@} 0 l {modulepath\
140-
alias dirwsym indesym sym tag key hidden variant variantifspec via} {}\
141-
{} eltlist}\
140+
alias provided-alias dirwsym indesym sym tag key hidden variant\
141+
variantifspec via} {} {} eltlist}\
142142
spider_terse_output {MODULES_SPIDER_TERSE_OUTPUT {@spiderterseoutput@} 0 l\
143-
{modulepath alias dirwsym indesym sym tag key hidden variant\
144-
variantifspec} {} {} eltlist}\
143+
{modulepath alias provided-alias dirwsym indesym sym tag key hidden\
144+
variant variantifspec} {} {} eltlist}\
145145
source_cache {MODULES_SOURCE_CACHE @sourcecache@ 0 b {0 1}}\
146146
sticky_purge {MODULES_STICKY_PURGE {@stickypurge@} 0 s {error warning\
147147
silent}}\

tcl/modscan.tcl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,12 @@ proc getModMatchingExtraSpec {modpath pxtlist} {
357357
# determine if current module search requires an extra match search
358358
proc isExtraMatchSearchRequired {mod} {
359359
# an extra match search is required if not currently inhibited and:
360-
# * variant should be reported in output
360+
# * variant or provided-alias should be reported in output
361361
# * mod specification contains variant during avail/paths/whatis
362362
# * mod specification contains extra specifier during avail/paths/whatis
363363
return [expr {![getState inhibit_ems 0] && ([isEltInReport variant 0] ||\
364-
(([llength [getVariantListFromVersSpec $mod]] || [llength\
364+
[isEltInReport provided-alias 0] || (([llength\
365+
[getVariantListFromVersSpec $mod]] || [llength\
365366
[getExtraListFromVersSpec $mod]]) && [currentState commandname] in\
366367
{avail paths whatis spider}))}]
367368
}
@@ -379,7 +380,7 @@ proc filterExtraMatchSearch {modpath mod res_arrname versmod_arrname} {
379380
set check_extra [llength $spec_xt_list]
380381
set check_tag [llength $spec_tag_list]
381382
set scan_eval [expr {$check_variant || $check_extra || [isEltInReport\
382-
variant 0]}]
383+
variant 0] || [isEltInReport provided-alias 0]}]
383384
set filter_res [expr {$check_variant || $check_extra || $check_tag}]
384385

385386
if {$scan_eval} {

tcl/report.tcl.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,8 @@ proc reportModules {search_queries header hsgrkey hstyle show_mtime show_idx\
14481448
set report_sym [isEltInReport sym]
14491449
}
14501450
set report_tag [isEltInReport tag]
1451-
set report_alias [isEltInReport alias]
1451+
set report_alias [expr {[isEltInReport alias] || [isEltInReport\
1452+
provided-alias]}]
14521453
# enable variant report if variantifspec configured and some variant is
14531454
# specified in query or variant configured for report or list sub-command
14541455
# json output

tcl/subcmd.tcl.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ proc cmdModuleList {show_oneperline show_mtime search_match args} {
3939
}
4040

4141
set report_indesym [isEltInReport indesym 0]
42-
set report_alias [isEltInReport alias 0]
42+
set report_alias [expr {[isEltInReport alias 0] || [isEltInReport\
43+
provided-alias 0]}]
4344

4445
# build list of loaded modules and symbolics and aliases if reported
4546
set loadedmodlist [list]

0 commit comments

Comments
 (0)