Fix extra spec search for mod matching requirement query

always_read_full_file state is initialized after parsing of search
query. As a result readModuleContent fails to read module defined in
search query. This module is afterward skipped during modulefile scan
evaluations.

Fixes #494

Author: xdelaruelle

NEWS.rst

@@ -6,9 +6,9 @@ Release notes
 This file describes changes in recent versions of Modules. It primarily
 documents those changes that are of interest to users and admins.
 
-.. _5.X release notes:
+.. _5.3 release notes:
 
-Modules 5.X.Y (not yet released)
+Modules 5.3.1 (not yet released)
 --------------------------------
 
 * Fix additional `ShellCheck`_ warning reports over sh and bash shell scripts.
@@ -17,10 +17,10 @@ Modules 5.X.Y (not yet released)
   Modules from git repository.
 * Install: adapt RPM spec file to install module initialization script for
   fish as configuration snippet for this shell.
+* Fix extra specifier search to evaluate module matching requirement query.
+  (fix issue #494)
 
 
-.. _5.3 release notes:
-
 Modules 5.3.0 (2023-05-14)
 --------------------------
 

tcl/main.tcl.in

@@ -355,6 +355,12 @@ proc module {command args} {
       knerror "${msgprefix}Invalid command '$command'$tryhelpmsg"
    }
 
+   # define states needed by module spec parsing and sub-command processing
+   # define if modfile should always be fully read even for validity check
+   lappendState always_read_full_file [expr {$command ni [list path paths\
+      list avail aliases edit]}]
+   lappendState commandname $command
+
    # parse options, do that globally to ignore options not related to a given
    # module sub-command (exclude them from arg list)
    lassign [parseModuleCommandArgs $topcall $command 0 {*}$args]\
@@ -387,8 +393,8 @@ proc module {command args} {
       }
       # other commands can only be called from modulefile evaluated from
       # command acting as top-level context (source and autoinit)
-      if {([depthState modulename] > 1 || [currentState commandname] ni [list\
-         source autoinit]) && $command eq {config}} {
+      if {([depthState modulename] > 1 || [aboveCommandName] ni [list source\
+         autoinit]) && $command eq {config}} {
          knerror "${msgprefix}Command '$command' not supported$tryhelpmsg"
       }
       # no requirement should be recorded this module load/unload/switch cmd
@@ -447,11 +453,6 @@ proc module {command args} {
       knerror "Unexpected number of args for '$command' command$tryhelpmsg"
    }
 
-   # define if modfile should always be fully read even for validity check
-   lappendState always_read_full_file [expr {$command ni [list path paths\
-      list avail aliases edit]}]
-   lappendState commandname $command
-
    if {$topcall} {
       # Find and execute any global rc file found
       runModulerc
@@ -573,6 +574,10 @@ proc ml {args} {
    if {$cmdvalid} {
       module $command {*}$margs
    } else {
+      # define if modfile should always be fully read even for validity check
+      lappendState always_read_full_file 1
+      lappendState commandname ml
+
       # parse specified module and get list of mods to unload and mods to load
       defineParseModuleSpecificationProc [getConf advanced_version_spec]
       lassign [parseModuleSpecification 1 0 0 0 {*}$fargs] modunlist modlolist
@@ -585,10 +590,6 @@ proc ml {args} {
          show_mtime show_filter search_filter search_match dump_state\
          addpath_pos not_req tag_list fargs
 
-      # define if modfile should always be fully read even for validity check
-      lappendState always_read_full_file 1
-      lappendState commandname ml
-
       # Find and execute any global rc file found
       runModulerc
 

testsuite/modulefiles.4/extra/1.0

@@ -167,6 +167,9 @@ if {[info exists env(TESTSUITE_EXTRA)]} {
         load6 {
             module load
         }
+        load7 {
+            module load extra/1.0
+        }
         module-err1 {
             module unk foo
         }

testsuite/modules.51-scan/043-extra_spec-require.exp

@@ -335,6 +335,11 @@ setenv_var TESTSUITE_EXTRA load6
 testouterr_cmd sh {avail -t extra load:xtfoo} OK {}
 testouterr_cmd sh {avail -t extra load:} ERR [err_extraspec load:]
 
+# module requiring itself
+setenv_var TESTSUITE_EXTRA load7
+testouterr_cmd sh {avail -t extra load:extra/1.0} OK $tserr
+testouterr_cmd sh {ml av -t extra load:extra/1.0} OK $tserr
+
 
 #
 # module erroneous commands