From e1ace9d389952803c83d2515a90c906e0c15fdfd Mon Sep 17 00:00:00 2001
From: gsell <achim.gsell@psi.ch>
Date: Fri, 21 Apr 2023 09:10:19 +0000
Subject: [PATCH] Merge branch '198-dont-setenv-is-broken' into 'master'

Resolve "dont-setenv is broken"

Closes #198

See merge request Pmodules/src!174

(cherry picked from commit 21004e09ff4669b6c18cbf4e549034e5f07790c6)

68ac0bc2 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 4abdabf..32bea66 100644
--- a/Pmodules/libmodules.tcl
+++ b/Pmodules/libmodules.tcl
@@ -172,16 +172,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
 		}
 	}