envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-14 00:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

unset env var when setting it to empty val on Win

Browse Source 
When an empty string is set to an environment variable on Windows
platform, this variable is unset yet still seen defined by 'info exists'
command on Tcl, which leads to errors when trying to access variable
content. So when trying to set an empty string to an environment
variable on Windows platform, call for variable unset instead to reflect
underlying OS behavior.
This commit is contained in:
Xavier Delaruelle
2020-09-10 07:46:16 +02:00
parent ea66fa3cb0
commit ef95c7fb55
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modulecmd.tcl.in
View File

@@ -1283,16 +1283,24 @@ proc get-env {var {valifunset {}}} {
proc set-env {var val} {
set mode [currentMode]
reportDebug "$var=$val"
interp-sync-env set $var $val
# variable is not cleared anymore if set again
if {[info exists ::g_clearedEnvVars($var)]} {
unset ::g_clearedEnvVars($var)
}
# an empty string value means unsetting variable on Windows platform, so
# call unset-env to ensure variable will not be seen defined yet raising
# an error when trying to access it
if {[getState is_win] && $val eq {}} {
unset-env $var
} else {
interp-sync-env set $var $val
# propagate variable setup to shell environment on load and unload mode
if {$mode eq {load} || $mode eq {unload}} {
set ::g_stateEnvVars($var) new
# variable is not cleared anymore if set again
if {[info exists ::g_clearedEnvVars($var)]} {
unset ::g_clearedEnvVars($var)
}
# propagate variable setup to shell environment on load and unload mode
if {$mode eq {load} || $mode eq {unload}} {
set ::g_stateEnvVars($var) new
}
}
}