Skip to content

TDAQ Environment Variables Fix, master branch (2019.08.19.)

Attila Krasznahorkay requested to merge akraszna/atlasexternals:TDaqEnvFix-master-20190819 into master

Switched the order of the tdaq environment variables to the correct one. To one in which the basic variables would be set up before the more derived ones.

This is to fix the issue described in ATLINFR-3098.

With this setup, the env_setup.sh file generated for the Athena project ends up looking like:

if [ -z "${TDAQ_VERSION}" ]; then
   export TDAQ_VERSION=08-03-01
fi
if [ -z "${TDAQ_RELEASE_BASE}" ]; then
   export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
fi
if [ -z "${TDAQ_DB_PATH}" ]; then
   export TDAQ_DB_PATH=${TDAQ_RELEASE_BASE}/tdaq/tdaq-08-03-01/installed/share/data
fi
if [ -z "${TDAQ_DB_PATH}" ]; then
   export TDAQ_DB_PATH=${TDAQ_RELEASE_BASE}/tdaq/tdaq-08-03-01/installed/databases
else
   export TDAQ_DB_PATH=${TDAQ_DB_PATH}:${TDAQ_RELEASE_BASE}/tdaq/tdaq-08-03-01/installed/databases
fi
if [ -z "${TDAQ_DB_PATH}" ]; then
   export TDAQ_DB_PATH=${TDAQ_RELEASE_BASE}/tdaq/tdaq-08-03-01/databases
else
   export TDAQ_DB_PATH=${TDAQ_DB_PATH}:${TDAQ_RELEASE_BASE}/tdaq/tdaq-08-03-01/databases
fi

In an ideal world ${TDAQ_VERSION} would also be used in setting up TDAQ_DB_PATH, but that sort of replacements we never had working so far. 😦 So I'd treat that issue separately, if at all...

Merge request reports