Skip to content

2tag: Correctly restore user-overwritten O2DPG env vars #2164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 1 commit into from
Oct 22, 2025
Merged

2tag: Correctly restore user-overwritten O2DPG env vars #2164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions MC/run/ANCHOR/anchorMC.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ fi
#<----- START OF part that should run under a clean alternative software environment if this was given ------
if [ "${ALIEN_JDL_O2DPG_ASYNC_RECO_TAG}" ]; then
if [ "${LOADEDMODULES}" ]; then
export > env_before_stashing.env
printenv > env_before_stashing.printenv
echo "Stashing initial modules"
module save initial_modules.list # we stash the current modules environment
module list --no-pager
module purge --no-pager
export > env_after_stashing.env
printenv > env_after_stashing.printenv
echo "Modules after purge"
module list --no-pager
fi
Expand Down Expand Up @@ -272,10 +272,17 @@ if [ "${ALIEN_JDL_O2DPG_ASYNC_RECO_TAG}" ]; then
echo "Restoring initial environment"
module --no-pager restore initial_modules.list
module saverm initial_modules.list
if [ "${ALIEN_JDL_O2DPG_OVERWRITE}" ]; then
echo "Setting back O2DPG_ROOT to overwritten path ${ALIEN_JDL_O2DPG_OVERWRITE}"
export O2DPG_ROOT=${ALIEN_JDL_O2DPG_OVERWRITE}
fi

# Restore overwritten O2DPG variables set by modules but changed by user
# (in particular custom O2DPG_ROOT and O2DPG_MC_CONFIG_ROOT)
printenv > env_after_restore.printenv
comm -12 <(grep '^O2DPG' env_before_stashing.printenv | cut -d= -f1 | sort) \
<(grep '^O2DPG' env_after_restore.printenv | cut -d= -f1 | sort) |
while read -r var; do
b=$(grep "^$var=" env_before_stashing.printenv | cut -d= -f2-)
a=$(grep "^$var=" env_after_restore.printenv | cut -d= -f2-)
[[ "$b" != "$a" ]] && export "$var=$b" && echo "Reapplied: $var to ${b}"
done
fi
#<----- END OF part that should run under a clean alternative software environment if this was given ------

Expand Down