This commit is contained in:
2019-05-15 15:01:48 +02:00
parent 4f2558b524
commit a1821a961b
2 changed files with 17 additions and 12 deletions
+16 -10
View File
@@ -68,21 +68,27 @@ proc module-addgroup { group } {
debug "no orphan modules to unload"
}
debug "mode=remove: $env(MODULEPATH)"
remove-path MODULEPATH [file join \
$::PmodulesRoot \
$group \
$::PmodulesModulfilesDir \
{*}$::variant]
set dir [file join \
$::PmodulesRoot \
$group \
$::PmodulesModulfilesDir \
{*}$::variant]
debug "mode=remove: dir=$dir"
remove-path MODULEPATH $dir
debug "mode=remove: $env(UsedGroups)"
remove-path UsedGroups $group
debug "mode=remove: $env(UsedGroups)"
}
if { [module-info mode switch2] } {
debug "mode=switch2"
append-path MODULEPATH [file join \
$::PmodulesRoot \
$group \
$::PmodulesModulfilesDir \
[module-info name]]
set dir [file join \
$::PmodulesRoot \
$group \
$::PmodulesModulfilesDir \
[module-info name]]
if { [file isdirectory $dir] } {
append-path MODULEPATH $dir
}
append-path UsedGroups ${group}
}
}
+1 -2
View File
@@ -670,8 +670,7 @@ subcommand_load() {
current_modulefile="${array[0]}"
prefix="${array[1]}"
test -n "${current_modulefile}" || return 1
get_release release "${current_modulefile}"
[[ :${UsedReleases}: =~ ${release} ]]
get_release release "${current_modulefile}" "${UsedReleases}"
}
#