Skip to content

Commit d76f044

Browse files
committed
Return if prereq has been loaded on loadRequirementModuleList
Update loadRequirementModuleList procedure to also return if one of the requirement from list has been loaded.
1 parent f9bba34 commit d76f044

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

tcl/main.tcl.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,8 @@ proc module {command args} {
509509
} else {
510510
# attempt load of not already loaded modules
511511
foreach arg $args {
512-
set retlo [loadRequirementModuleList $tag_list $arg]
512+
lassign [loadRequirementModuleList $tag_list $arg]\
513+
retlo
513514
# update return value if an issue occurred unless
514515
# force mode is enabled
515516
if {$retlo != 0 && ![getState force]} {

tcl/modeval.tcl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,7 @@ proc restoreSettings {} {
615615
# load modules passed as args designated as requirement
616616
proc loadRequirementModuleList {tag_list args} {
617617
set ret 0
618+
set prereqloaded 0
618619

619620
# calling procedure must have already parsed module specification in args
620621
foreach mod $args {
@@ -627,7 +628,6 @@ proc loadRequirementModuleList {tag_list args} {
627628

628629
if {$loadedmod eq {}} {
629630
set imax [llength $args]
630-
set prereqloaded 0
631631
# if prereq list specified, try to load first then
632632
# try next if load of first module not successful
633633
for {set i 0} {$i<$imax && $prereqloaded==0} {incr i 1} {
@@ -667,11 +667,12 @@ proc loadRequirementModuleList {tag_list args} {
667667
# output held messages
668668
releaseHeldReport {*}$holdidlist
669669
} else {
670+
set prereqloaded 1
670671
# apply missing tag to first loaded module found
671672
cmdModuleTag 0 0 $tag_list $loadedmod
672673
}
673674

674-
return $ret
675+
return [list $ret $prereqloaded]
675676
}
676677

677678
# unload phase of a list of modules reload process

0 commit comments

Comments
 (0)