Check if mod is already loaded before looking at avails

When trying to load a module, first look into already loaded modules and
their alternative names prior resolving available modules.

Only take into account the loaded module that exactly matches the module
specification passed to cmdModuleLoad. Which means that partial start
match, version range or version list are not taken into account (to be
able to resolve to the default from these kind of specifications).

Fixes #602

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

NEWS.rst

@@ -39,6 +39,9 @@ Modules 5.6.1 (not yet released)
 * Always apply *abort on error* behavior in case a Dependent Reload sticky
   (and :option:`--force` is not set) or super-sticky module fails to reload.
   (fix issue #601)
+* When loading a module, check already loaded modules and their aliases
+  exactly matching specification before looking at available modules and their
+  aliases. (fix issue #602)
 
 .. _Furo: https://github.com/pradyunsg/furo
 

tcl/modfind.tcl.in

@@ -1195,10 +1195,11 @@ proc getPathToModule {mod {indir {}} {report_issue 1} {look_loaded no}\
    # or to find a closest match (used when switching with single name arg)
    } elseif {$look_loaded ne {no}} {
       switch -- $look_loaded {
-         match {set getLoadedNameProc getLoadedMatchingName}
+         exact {set getLoadedNameProc getLoadedExactName}
+         match {set getLoadedNameProc getLoadedEqstartName}
          close {set getLoadedNameProc getLoadedWithClosestName}
       }
-      if {[set lm [$getLoadedNameProc $mod]] ne {}} {
+      if {[set lm [$getLoadedNameProc $mod $indir]] ne {}} {
          set vrlist [getVariantList $lm 1]
          set retlist [list [getModulefileFromLoadedModule $lm] $lm]
       } else {
@@ -1436,7 +1437,7 @@ proc unsetLoadedModule {mod modfile} {
 # return the currently loaded module whose name is the closest to the
 # name passed as argument. if no loaded module match at least one part
 # of the passed name, an empty string is returned.
-proc getLoadedWithClosestName {name} {
+proc getLoadedWithClosestName {name modulepath_list} {
    set ret {}
    set retmax 1
 
@@ -1497,12 +1498,20 @@ proc getLoadedWithClosestName {name} {
    return $ret
 }
 
+proc getLoadedExactName {name modulepath_list} {
+   return [getLoadedMatchingName $name {} 0 {} $modulepath_list eqspec]
+}
+
+proc getLoadedEqstartName {name modulepath_list} {
+   return [getLoadedMatchingName $name {} 0 {} $modulepath_list]
+}
+
 # return the currently loaded module whose name is equal or include the name
 # passed as argument. if no loaded module match, an empty string is returned.
 # loading: look at currently loading modules instead of loaded if loading == 1
 # lmlist: only take into account passed loaded module list not all loaded mods
 proc getLoadedMatchingName {name {behavior {}} {loading 0} {lmlist {}}\
-   {modulepath_list {}}} {
+   {modulepath_list {}} {eqtest eqstart}} {
    set ret {}
    set retmax 0
    # get default behavior from unload_match_order config
@@ -1569,7 +1578,7 @@ proc getLoadedMatchingName {name {behavior {}} {loading 0} {lmlist {}}\
          if {![$isLoadedMatchSpecificPath $mod $modulepath_list]} {
             continue
          }
-         if {[modEq $name $matchmod eqstart 1 [expr {$loading ? 1 : 2}] 1]} {
+         if {[modEq $name $matchmod $eqtest 1 [expr {$loading ? 1 : 2}] 1]} {
             switch -- $behavior {
                returnlast {
                   # the last loaded module will be returned

tcl/modspec.tcl

@@ -1690,6 +1690,13 @@ proc getModuleNameFromVersSpec {modarg} {
    }
 }
 
+proc getCmpSpecFromVersSpec {modarg} {
+   if {[info exists ::g_moduleVersSpec($modarg)]} {
+      return [lindex $::g_moduleVersSpec($modarg) 2]
+   } else {
+      return eq
+   }
+}
 # get module root name from module name and version spec if parsed
 proc getModuleRootFromVersSpec {modarg} {
    if {[info exists ::g_moduleVersSpec($modarg)]} {

tcl/subcmd.tcl.in

@@ -1114,8 +1114,17 @@ proc cmdModuleLoad {context uasked tryload loadany tag_list modulepath_list\
       # error if module not found or forbidden
       set notfounderr [expr {!$tryload}]
 
-      lassign [getPathToModule $mod $modulepath_list $notfounderr] modfile\
-         modname modnamevr
+      # first try to resolve over loaded mods unless spec corresponds to
+      # multiple module designations, otherwise search avail mods
+      unset -nocomplain modfile
+      if {[getCmpSpecFromVersSpec $mod] eq {eq}} {
+         lassign [getPathToModule $mod $modulepath_list 0 exact] modfile\
+            modname modnamevr
+      }
+      if {![info exists modfile] || ![string length $modfile]} {
+         lassign [getPathToModule $mod $modulepath_list $notfounderr] modfile\
+            modname modnamevr
+      }
 
       # record evaluation attempt on specified module name
       registerModuleEvalAttempt $context $mod $modfile