From 996c8f19aefeaaa657a58240a10e7318ebe35a0c Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Sat, 4 Mar 2017 13:57:38 +0000
Subject: [PATCH] Task #8691: Dragnet deploy & activate scripts: force svn
 export in case last run failed to rm exported script

---
 SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh | 2 +-
 SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh
index f9d2956e5a2..3edb851ed4f 100755
--- a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh
+++ b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh
@@ -6,7 +6,7 @@
 # Preferably run as lofarbuild. It can write in /opt/lofar_versions/, but it also needs to own the symlink.
 #
 # Jenkins shell command:
-# svn export https://svn.astron.nl/LOFAR/trunk/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh && \
+# svn export --force https://svn.astron.nl/LOFAR/trunk/SubSystems/Dragnet/scripts/LOFAR-Dragnet-activate.sh && \
 #   ./LOFAR-Dragnet-activate.sh "$LOFAR_SVN_TAG" && \
 #   rm LOFAR-Dragnet-activate.sh
 #
diff --git a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
index c075feb48d9..0f63428bd54 100755
--- a/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
+++ b/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh
@@ -10,7 +10,7 @@
 # - install new module env file into /etc/modulefiles/lofar/
 #
 # Jenkins shell command:
-# svn export https://svn.astron.nl/LOFAR/trunk/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh && \
+# svn export --force https://svn.astron.nl/LOFAR/trunk/SubSystems/Dragnet/scripts/LOFAR-Dragnet-deploy.sh && \
 #   ./LOFAR-Dragnet-deploy.sh "$LOFAR_SVN_TAG" && \
 #   rm LOFAR-Dragnet-deploy.sh
 #
-- 
GitLab