Refactor 'module load' to use loadRequirementModuleList

Update module procedure to use loadRequirementModuleList procedure when
loading modules in load evaluation mode when auto_handling is disabled.

Update the loadRequirementModuleList to return 0 is everything went well
or 1 if an issue occurred.

Author: xdelaruelle

tcl/main.tcl.in

@@ -515,23 +515,13 @@ proc module {command args} {
                   } else {
                      # attempt load of not already loaded modules
                      foreach arg $args {
-                        if {![is-loaded $arg] && ![is-loading $arg]} {
-                           lappend modlist $arg
-                        } else {
-                           lappend loadedmodlist $arg
+                        set retlo [loadRequirementModuleList $tag_list $arg]
+                        # update return value if an issue occurred unless
+                        # force mode is enabled
+                        if {$retlo != 0 && ![getState force]} {
+                           set ret $retlo
                         }
                      }
-                     if {[info exists modlist]} {
-                        set ret [cmdModuleLoad reqlo 0 $tag_list {*}$modlist]
-                        # ignore obtained error if force mode enabled
-                        if {[getState force]} {
-                           set ret 0
-                        }
-                     }
-                     # update tags on already loaded modules
-                     if {[info exists loadedmodlist]} {
-                        cmdModuleTag 0 0 $tag_list {*}$loadedmodlist
-                     }
                   }
                }
                # register modulefiles to load as individual prereqs or all at

tcl/modeval.tcl

@@ -614,6 +614,8 @@ proc restoreSettings {} {
 
 # load modules passed as args designated as requirement
 proc loadRequirementModuleList {tag_list args} {
+   set ret 0
+
    # calling procedure must have already parsed module specification in args
    foreach mod $args {
       # get first loaded or loading mod in args list
@@ -635,14 +637,19 @@ proc loadRequirementModuleList {tag_list args} {
          # those that failed if one succeed
          set curholdid load-$i-$arg
          lappendState reportholdid $curholdid
-         if {[catch {cmdModuleLoad reqlo 0 $tag_list $arg} errorMsg]} {
+         if {[catch {set retlo [cmdModuleLoad reqlo 0 $tag_list $arg]}\
+            errorMsg]} {
             # if an error is raised, release output and rethrow the error
             # (could be raised if no modulepath defined for instance)
             lpopState reportholdid
             lappend holdidlist $curholdid report
             releaseHeldReport {*}$holdidlist
             knerror $errorMsg
          }
+         # update return value if an issue occurred in cmdModuleLoad
+         if {$retlo != 0} {
+            set ret $retlo
+         }
          lpopState reportholdid
 
          if {[is-loaded $arg]} {
@@ -663,6 +670,8 @@ proc loadRequirementModuleList {tag_list args} {
       # apply missing tag to first loaded module found
       cmdModuleTag 0 0 $tag_list $loadedmod
    }
+
+   return $ret
 }
 
 # unload phase of a list of modules reload process

testsuite/modules.50-cmds/517-always-load.exp

@@ -138,11 +138,6 @@ lappend ans [list set LOADEDMODULES foo/1.0:bar/1.0:$mod]
 lappend ans [list set __MODULES_LMTAG foo/1.0&keep-loaded:bar/1.0&keep-loaded&auto-loaded]
 set tserr [msg_top_load $mod {} {bar/1.0} {}]
 testouterr_cmd sh "load --auto $mod" $ans $tserr
-set ans [list]
-lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0&bar/1.0]
-lappend ans [list set _LMFILES_ $mp/foo/1.0:$mp/bar/1.0:$modfile]
-lappend ans [list set LOADEDMODULES foo/1.0:bar/1.0:$mod]
-lappend ans [list set __MODULES_LMTAG bar/1.0&keep-loaded&auto-loaded:foo/1.0&keep-loaded]
 testouterr_cmd sh "load --no-auto $mod" $ans $tserr
 
 setenv_loaded_module [list bar/1.0] [list $mp/bar/1.0]