From e2117723b3cf5c66c078b85e64cd4d6d2e9238a0 Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Sun, 9 May 2021 12:52:04 +0200 Subject: [PATCH] doc: fix modulecmd state check in recipe code Code to handle the internal states of modulecmd have been reworked on Modules v4.6. As a consequence several siteconfig.tcl extension scripts described on documentation recipes have to be adapted. Closes #396 --- doc/example/log-module-commands/siteconfig.tcl | 2 +- doc/example/top-priority-values/siteconfig.tcl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/example/log-module-commands/siteconfig.tcl b/doc/example/log-module-commands/siteconfig.tcl index dbfb8821d..ecb7ab3bd 100644 --- a/doc/example/log-module-commands/siteconfig.tcl +++ b/doc/example/log-module-commands/siteconfig.tcl @@ -13,7 +13,7 @@ # override 'module' procedure to log each call made by user rename ::module ::__module proc module {command args} { - if {[getEvalModuleStackDepth] == 0} { + if {[depthState modulename] == 0} { exec logger -t module "[get-env USER]: $command [join $args]" } return [eval __module "{$command}" $args] diff --git a/doc/example/top-priority-values/siteconfig.tcl b/doc/example/top-priority-values/siteconfig.tcl index 0d0489201..6770182ef 100644 --- a/doc/example/top-priority-values/siteconfig.tcl +++ b/doc/example/top-priority-values/siteconfig.tcl @@ -40,7 +40,7 @@ proc setenv {args} { if {$topPriority} { # define an helper variable to know a top-priority value has been set - if {[currentMode] ne "display"} { + if {[currentState mode] ne "display"} { __setenv MODULES_PRIORITY_$var $val } __setenv $var $val @@ -77,7 +77,7 @@ proc setenv-un {args} { if {$topPriority} { # define an helper variable to know a top-priority value has been set - if {[currentMode] ne "display"} { + if {[currentState mode] ne "display"} { __setenv-un MODULES_PRIORITY_$var $val } __setenv-un $var $val