Include mod loaded from other path in conflict_unload

Update *Conflict Unload* mechanism to also include module loaded from
another modulepath than the one specified for a requirement to load.

As a result, such module loaded from another path will be unloaded to be
replaced by the module from the selected modulepath.

Author: xdelaruelle

tcl/modfind.tcl.in

@@ -1629,7 +1629,7 @@ proc getLoadedConflict {mod} {
    }
 }
 
-proc getModuleLoadedConflict {mod} {
+proc getModuleLoadedConflict {mod {modulepath_list {}}} {
    set mod_con_list {}
    defineModEqProc [isIcase] [getConf extended_default] 1
    # get module short name if loaded by its full pathname
@@ -1667,7 +1667,8 @@ proc getModuleLoadedConflict {mod} {
       }
    }
 
-   if {[isOtherVariantOfModuleLoaded $mod]} {
+   if {[isOtherVariantOfModuleLoaded $mod] || ([isModuleLoaded $mod] &&\
+      ![isLoadedMatchSpecificPath $mod $modulepath_list 0])} {
       lappend mod_con_list [getModuleNameAndVersFromVersSpec $mod]
    }
 

tcl/subcmd.tcl.in

@@ -1170,7 +1170,11 @@ proc cmdModuleLoad {context uasked tryload loadany tag_list modulepath_list\
             # constrained list
             if {![isLoadedMatchSpecificPath $modname $modulepath_list [expr\
                {!$isloaded}]]} {
-               knerror [getModFromDiffPathIsLoadedMsg]
+               # no error if ConUn mechanism handles unload of this module
+               if {![getConf auto_handling] || ![getConf conflict_unload] ||\
+                  $isloading} {
+                  knerror [getModFromDiffPathIsLoadedMsg]
+               }
             # stop if same mod is loaded but with a different set of variants
             } elseif {[isOtherVariantOfModuleLoaded $modnamevr] ||\
                [isOtherVariantOfModuleLoading $modnamevr]} {
@@ -1216,7 +1220,8 @@ proc cmdModuleLoad {context uasked tryload loadany tag_list modulepath_list\
          if {[getConf auto_handling]} {
             if {[getConf conflict_unload]} {
                # get loaded conflicting modules and unload them (ConUn)
-               set conun_mod_list [getModuleLoadedConflict $modnamevr]
+               set conun_mod_list [getModuleLoadedConflict $modnamevr\
+                  $modulepath_list]
                reportDebug "conun mod list is '$conun_mod_list'"
                if {[llength $conun_mod_list]} {
                   foreach conun_mod [lreverse $conun_mod_list] {