From b3a6adf9f830657776d809ec60f6f18f7b34c93a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 2 Jun 2021 18:23:04 +0200
Subject: [PATCH] modulecmd: handle changes in PMODULES_ENV for old versions

---
 Pmodules/modulecmd.bash.in | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index cf18a35..4bf884a 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -2285,6 +2285,25 @@ if [[ -n ${PMODULES_ENV} ]]; then
 			declare -a UsedFlags=( "${!UseFlags[@]}" )
 			unset UseFlags
 		fi
+		if [[ ! -v UsedFlags ]]; then
+			declare -a UsedFlags=()
+		fi
+		if [[ -v UsedReleases ]]; then
+			declare -- UsedReleaseStages="${UsedReleases}"
+			unset UsedReleases
+		fi
+		if [[ -v PMODULES_DEFAULT_GROUPS ]]; then
+			declare -- DefaultGroups="${PMODULES_DEFAULT_GROUPS}"
+			unset PMODULES_DEFAULT_GROUPS
+		fi
+		if [[ -v PMODULES_DEFINED_RELEASES ]]; then
+			declare -- ReleaseStages="${PMODULES_DEFINED_RELEASES}"
+			unset PMODULES_DEFINED_RELEASES
+		fi
+		if [[ -v PMODULES_DEFAULT_RELEASES ]]; then
+			declare -- DefaultReleaseStages="${PMODULES_DEFAULT_RELEASES}"
+			unset PMODULES_DEFAULT_RELEASES
+		fi
 		g_env_must_be_saved='yes'
 	fi
 	if [[ -v DefaultGroups ]] || [[ -v DefaultReleaseStages ]] || [[ -v ReleaseStages ]]; then