Apply new tags set on loaded requirement

Update the loadRequirementModuleList procedure to apply tags defined on
the first requirement found loaded.

Author: xdelaruelle

tcl/main.tcl.in

@@ -517,6 +517,8 @@ proc module {command args} {
                      foreach arg $args {
                         if {![is-loaded $arg] && ![is-loading $arg]} {
                            lappend modlist $arg
+                        } else {
+                           lappend loadedmodlist $arg
                         }
                      }
                      if {[info exists modlist]} {
@@ -526,6 +528,10 @@ proc module {command args} {
                            set ret 0
                         }
                      }
+                     # update tags on already loaded modules
+                     if {[info exists loadedmodlist]} {
+                        cmdModuleTag $tag_list {*}$loadedmodlist
+                     }
                   }
                }
                # register modulefiles to load as individual prereqs or all at

tcl/mfinterp.tcl.in

@@ -1733,7 +1733,15 @@ proc prereq {args} {
       loadRequirementModuleList $tag_list {*}$args
    }
 
-   if {![is-loaded {*}$args] && ![is-loading {*}$args]} {
+   foreach mod $args {
+      # get first loaded or loading mod in args list
+      if {[set loadedmod [getLoadedMatchingName $mod returnfirst]] ne {} ||\
+         [set loadedmod [getLoadedMatchingName $mod returnfirst 1]] ne {}} {
+         break
+      }
+   }
+
+   if {$loadedmod eq {}} {
       set retisreqlo [isModuleEvaluated reqlo $curmodnamevr {*}$args]
       # report message on currently evaluated module message block
       if {![set retiseval [isModuleEvaluated any $curmodnamevr {*}$args]] ||\
@@ -1763,6 +1771,9 @@ proc prereq {args} {
             knerror $msg MODULES_ERR_GLOBALTOP
          }
       }
+   } elseif {![getConf auto_handling]} {
+      # apply missing tag to first loaded module found
+      cmdModuleTag $tag_list $loadedmod
    }
 
    return {}

tcl/modeval.tcl

@@ -615,7 +615,15 @@ proc restoreSettings {} {
 # load modules passed as args designated as requirement
 proc loadRequirementModuleList {tag_list args} {
    # calling procedure must have already parsed module specification in args
-   if {![is-loaded {*}$args] && ![is-loading {*}$args]} {
+   foreach mod $args {
+      # get first loaded or loading mod in args list
+      if {[set loadedmod [getLoadedMatchingName $mod returnfirst]] ne {} ||\
+         [set loadedmod [getLoadedMatchingName $mod returnfirst 1]] ne {}} {
+         break
+      }
+   }
+
+   if {$loadedmod eq {}} {
       set imax [llength $args]
       set prereqloaded 0
       # if prereq list specified, try to load first then
@@ -651,6 +659,9 @@ proc loadRequirementModuleList {tag_list args} {
       }
       # output held messages
       releaseHeldReport {*}$holdidlist
+   } else {
+      # apply missing tag to first loaded module found
+      cmdModuleTag $tag_list $loadedmod
    }
 }