doc: desc. conflict_unload handling of modpath change

Author: xdelaruelle

NEWS.rst

@@ -116,14 +116,14 @@ Modules 5.5.0 (not yet released)
   defined by already loaded modules, conflict declared by loading module
   through :mfcmd:`conflict`, :mfcmd:`family` or :mfcmd:`module unload<module>`
   commands. :mconfig:`conflict_unload` also handles the unload of a module
-  that is loaded again but with different variant values.
-  :mconfig:`conflict_unload` is disabled by default as it changes behaviors of
-  the :envvar:`automated module handling mode<MODULES_AUTO_HANDLING>`. But
-  everyone is encouraged to enable this new option to benefit from an highly
-  automated experience. This option can be changed at installation time with
-  :instopt:`--enable-conflict-unload`. When :mconfig:`conflict_unload` is
-  changed with :subcmd:`config` sub-command, it sets the
-  :envvar:`MODULES_CONFLICT_UNLOAD` environment variable. Both
+  that is loaded again but with different variant values or from a different
+  modulepath. :mconfig:`conflict_unload` is disabled by default as it changes
+  behaviors of the :envvar:`automated module handling
+  mode<MODULES_AUTO_HANDLING>`. But everyone is encouraged to enable this new
+  option to benefit from an highly automated experience. This option can be
+  changed at installation time with :instopt:`--enable-conflict-unload`. When
+  :mconfig:`conflict_unload` is changed with :subcmd:`config` sub-command, it
+  sets the :envvar:`MODULES_CONFLICT_UNLOAD` environment variable. Both
   :mconfig:`auto_handling` and :mconfig:`conflict_unload` options should be
   enabled to activate *Conflict Unload* automated behavior. (fix issue #242)
 * When both :mconfig:`auto_handling` and :mconfig:`conflict_unload` options

doc/source/design/conflict-unload.rst

@@ -79,6 +79,8 @@ Conflict Unload mechanism targets the 3 different conflict situations:
 * Conflicts declared by loading modules against loaded modules (through
   ``conflict`` or ``module unload/switch`` modulefile commands)
 * Loading module is already loaded but with a different set of variants
+* Loading module is already loaded but from a different modulepath than those
+  asked by current load
 
 Loading modules here apply to asked module and the modules it requires.
 
@@ -96,8 +98,8 @@ conflicts information to get expected loaded modules in a minimum number of
 evaluations.
 
 When loading a module, prior evaluating it, if a conflict is declared against
-it (or this module is already loaded with an alternative variant set) by one
-or more:
+it (or this module is already loaded with an alternative variant set or from
+an alternative modulepath than the one asked) by one or more:
 
 * loaded modules, unload this or these modules. This or these unloads may
   trigger either DepRe and DepUn mechanisms.

doc/source/module.rst

@@ -4142,7 +4142,8 @@ ENVIRONMENT
 
  * Conflict Unload: unload of the *modulefiles* declared as a
    :mfcmd:`conflict` of the loading *modulefile* or if it is the same
-   *modulefile* than the one loading but with a different set of variant.
+   *modulefile* than the one loading but with a different set of variant or
+   coming from a different modulepath.
 
  * Requirement Load: load of the *modulefiles* declared as a :mfcmd:`prereq`
    of the loading *modulefile*.

doc/source/modulefile.rst

@@ -1969,9 +1969,9 @@ prior loading the modulefile that express such conflict when defined with
 expressed with :mfcmd:`module unload<module>` (unless dependent modulefiles
 are loaded) or if :mconfig:`auto_handling` and :mconfig:`conflict_unload`
 options are enabled. An error is raised when trying to load a module that is
-already loaded but with a different variant set. If both options are enabled
-the loaded module is automatically unloaded to satisfy the new set of variant
-asked.
+already loaded but with a different variant set or coming from a different
+modulepath. If both options are enabled the loaded module is automatically
+unloaded to satisfy the new set of variant or modulepath asked.
 
 It is strongly advised to define dependencies prior environment changes in a
 modulefile. Dependency resolution should be done before any environment change