From 68ac0bc28f1fc4788c7bf7ccead607f9d03f3ce4 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 21 Apr 2023 11:08:44 +0200
Subject: [PATCH] libmodules.tcl: dont setenv issue fixed

---
 Pmodules/libmodules.tcl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Pmodules/libmodules.tcl b/Pmodules/libmodules.tcl
index 37b9f9a..5393e48 100644
--- a/Pmodules/libmodules.tcl
+++ b/Pmodules/libmodules.tcl
@@ -215,16 +215,19 @@ proc _pmodules_setenv { PREFIX name version } {
 		setenv $key $value
 	}
 	dict for {key value} $setenv_dirs {
-		if { [lsearch ${::dont-setenv} $key] >= 0 || ![file isdirectory $key] } {
+		if { [lsearch ${::dont-setenv} $value] >= 0 || ![file isdirectory $key] } {
 			continue
 		}
 		setenv $value $key
 	}
 	dict for {key value} $prepend_dirs {
-		if { [lsearch ${::dont-setenv} $key] >= 0 || ![file isdirectory $key] } {
+		if { ![file isdirectory $key] } {
 			continue
 		}
 		foreach var $value {
+			if { [lsearch ${::dont-setenv} $var] >= 0 } {
+				continue
+			}
 			prepend-path $var $key
 		}
 	}