No nearly-forbidden warning on refresh/whatis/scan modes

xdelaruelle · xdelaruelle · commit 7dc5179ef988 · 2025-04-05T13:47:48.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
@@ -344,12 +344,13 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\
       if {[isModuleTagged $modnamevr forbidden 1 $modfile]} {
          set eval_return_code 1
          reportError [getForbiddenMsg $modnamevr $modfile]
-      } elseif {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\
-         nearly-forbidden 1 $modfile]} {
-         reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]
       }
    }
    if {$mode ni {unload refresh scan whatis}} {
+      if {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\
+         nearly-forbidden 1 $modfile]} {
+         reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]
+      }
       if {[isModuleTagged $modnamevr warning 1 $modfile]} {
          reportWarning [getWarningMsg $modnamevr $modfile]
       }

Original file line number	Diff line number	Diff line change
`@@ -344,12 +344,13 @@ proc execute-modulefile {modfile modname modnamevrvar modspec requested\`
`344`	`344`	`if {[isModuleTagged $modnamevr forbidden 1 $modfile]} {`
`345`	`345`	`set eval_return_code 1`
`346`	`346`	`reportError [getForbiddenMsg $modnamevr $modfile]`
`347`		`- } elseif {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\`
`348`		`- nearly-forbidden 1 $modfile]} {`
`349`		`- reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]`
`350`	`347`	`}`
`351`	`348`	`}`
`352`	`349`	`if {$mode ni {unload refresh scan whatis}} {`
	`350`	`+ if {![info exists nearlyforbidwarn] && [isModuleTagged $modnamevr\`
	`351`	`+ nearly-forbidden 1 $modfile]} {`
	`352`	`+ reportWarning [getNearlyForbiddenMsg $modnamevr $modfile]`
	`353`	`+ }`
`353`	`354`	`if {[isModuleTagged $modnamevr warning 1 $modfile]} {`
`354`	`355`	`reportWarning [getWarningMsg $modnamevr $modfile]`
`355`	`356`	`}`