From d388b14c98993a50e981196b5c2791da4b82b386 Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Fri, 10 Jan 2014 02:41:20 +0000
Subject: [PATCH] Task #5395: add commented-out: ignore sneaky parset overrides
through .cobalt/ in production
---
RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
index d42260a65de..aad5ddd3b6b 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
@@ -134,12 +134,19 @@ then
AUGMENTED_PARSET=$LOFARROOT/var/run/rtcp-$OBSID.parset
# Add static keys
+# # Ignore sneaky .cobalt/ parset overrides in production (lofarsys)
+# if [ "$USER" != "lofarsys" ]; then
+# DOT_COBALT_DEFAULT=$HOME/.cobalt/default/*.parset
+# DOT_COBALT_OVERRIDE=$HOME/.cobalt/override/*.parset
+# fi
cat $LOFARROOT/etc/parset-additions.d/default/*.parset \
- $HOME/.cobalt/default/*.parset \
+ $DOT_COBALT_DEFAULT \
$PARSET \
$LOFARROOT/etc/parset-additions.d/override/*.parset \
- $HOME/.cobalt/override/*.parset \
+ $DOT_COBALT_OVERRIDE \
> $AUGMENTED_PARSET || error "Could not create parset $AUGMENTED_PARSET"
+ unset DOT_COBALT_DEFAULT
+ unset DOT_COBALT_OVERRIDE
# If we force localhost, we need to remove the node list, or the first one will be used
if [ "$FORCE_LOCALHOST" -eq "1" ]
--
GitLab