Report nearly-forbidden warning only after module eval

xdelaruelle · xdelaruelle · commit 0119dc087e7c · 2025-04-05T13:49:31.000+02:00
Signed-off-by: Xavier Delaruelle &lt;xavier.delaruelle@cea.fr&gt;
diff --git a/tcl/interp.tcl.in b/tcl/interp.tcl.in
@@ -222,13 +222,6 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\
       collectModuleTags $modnamevr
    }
 
-   # inform that access to module will be soon denied
-   if {$mode ne {unload} && [isModuleTagged $modnamevr nearly-forbidden 1\
-      $modfile]} {
-      reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]
-      set nearlyforbidwarn 1
-   }
-
    if {![info exists ::g_modfileUntrackVars]} {
       # list variable that should not be tracked for saving
       array set ::g_modfileUntrackVars [list ModulesCurrentModulefile 1 env 1]
@@ -347,8 +340,7 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\
       }
    }
    if {$mode ni {unload refresh scan whatis}} {
-      if {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\
-         nearly-forbidden 1 $modfile]} {
+      if {[isModuleTagged $modnamevr nearly-forbidden 1 $modfile]} {
          reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]
       }
       if {[isModuleTagged $modnamevr warning 1 $modfile]} {

Original file line number	Diff line number	Diff line change
`@@ -222,13 +222,6 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\`
`222`	`222`	`collectModuleTags $modnamevr`
`223`	`223`	`}`
`224`	`224`
`225`		`- # inform that access to module will be soon denied`
`226`		`- if {$mode ne {unload} && [isModuleTagged $modnamevr nearly-forbidden 1\`
`227`		`- $modfile]} {`
`228`		`- reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]`
`229`		`- set nearlyforbidwarn 1`
`230`		`- }`
`231`		`-`
`232`	`225`	`if {![info exists ::g_modfileUntrackVars]} {`
`233`	`226`	`# list variable that should not be tracked for saving`
`234`	`227`	`array set ::g_modfileUntrackVars [list ModulesCurrentModulefile 1 env 1]`
`@@ -347,8 +340,7 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\`
`347`	`340`	`}`
`348`	`341`	`}`
`349`	`342`	`if {$mode ni {unload refresh scan whatis}} {`
`350`		`- if {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\`
`351`		`- nearly-forbidden 1 $modfile]} {`
	`343`	`+ if {[isModuleTagged $modnamevr nearly-forbidden 1 $modfile]} {`
`352`	`344`	`reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]`
`353`	`345`	`}`
`354`	`346`	`if {[isModuleTagged $modnamevr warning 1 $modfile]} {`