Merge branch 'dev'

examples/check-lsst-job-env.sh

@@ -63,7 +63,7 @@ for var in ${!envVars[@]}; do
 done
 
 # Check the butler repos pointed to by DAF_BUTLER_REPOSITORY_INDEX exist and
-# can actually be used by the butler.
+# can actually be used by the 'butler' command.
 if [[ -n ${DAF_BUTLER_REPOSITORY_INDEX} ]]; then
     releaseDir=$(ls -dr /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/w* | head -1)
     source "${releaseDir}/loadLSST.bash" && setup lsst_distrib
@@ -79,15 +79,16 @@ if [[ -n ${DAF_BUTLER_REPOSITORY_INDEX} ]]; then
 fi
 echo -e "\n"
 
-# Run epilog and check clean up was made
+# Run epilog and check no clean up was made to avoid modifying execution
+# environment of other PanDA pilot jobs running in the same Slurm job.
 if [[ -z ${LSST_LOCAL_EPILOG} ]]; then
     echo "ERROR: variable LSST_LOCAL_EPILOG is not set"
     exit 1
 fi
 
 source ${LSST_LOCAL_EPILOG}
-if [[ -n ${DAF_BUTLER_REPOSITORY_INDEX} ]] && [[ -f ${DAF_BUTLER_REPOSITORY_INDEX} ]]; then
-    echo "ERROR: after epilog, the butler repository index ${DAF_BUTLER_REPOSITORY_INDEX} should not exist"
+if [[ ! -f ${DAF_BUTLER_REPOSITORY_INDEX} ]] ; then
+    echo "ERROR: after epilog, the butler repository index ${DAF_BUTLER_REPOSITORY_INDEX} should still exist but doesn't"
 fi
 
 echo -e "\nEnd of execution"
\ No newline at end of file