From 9bea61e0842c92e1593be0f6a92eb362aaed24f1 Mon Sep 17 00:00:00 2001
From: Emil Obreshkov <emil.obreshkov@cern.ch>
Date: Fri, 13 Oct 2017 10:29:53 +0000
Subject: [PATCH] Merge branch 'master-copy_rpm_eos-update' into 'master'
Added protection for EOS false positive error.
See merge request !5397
Former-commit-id: 7f584a38582847519ab4360e8f01c364eed188ea
---
Build/AtlasBuildScripts/copy_rpm_eos.sh | 5 +++--
.../AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap | 0
Trigger/TrigT1/L1Common/cmt/fragments/l1common_files | 0
.../L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen | 0
.../TrigT1CaloEvent/src/components/TrigT1CaloEvent_load.cxx | 0
5 files changed, 3 insertions(+), 2 deletions(-)
mode change 100644 => 100755 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap
mode change 100644 => 100755 Trigger/TrigT1/L1Common/cmt/fragments/l1common_files
mode change 100755 => 100644 Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen
mode change 100755 => 100644 Trigger/TrigT1/TrigT1CaloEvent/src/components/TrigT1CaloEvent_load.cxx
diff --git a/Build/AtlasBuildScripts/copy_rpm_eos.sh b/Build/AtlasBuildScripts/copy_rpm_eos.sh
index 8bcb424dde8..67133d3cbe6 100755
--- a/Build/AtlasBuildScripts/copy_rpm_eos.sh
+++ b/Build/AtlasBuildScripts/copy_rpm_eos.sh
@@ -59,7 +59,7 @@ else
DDAY=${WEEKDAY}
fi
echo "====================================================="
-echo "=== STARTING RPMs copy to /eos"
+echo "=== STARTING RPMs copy to /eos at `date`"
echo "====================================================="
@@ -67,7 +67,8 @@ DESTDIR=${DESTDIR}/${BRANCH}/${ARCH}/${DDAY}
if [ ! -d ${DESTDIR} ] ; then
echo "mkdir -p ${DESTDIR}"
- mkdir -p ${DESTDIR} || ((ERROR_COUNT++))
+ mkdir -p ${DESTDIR}
+ if [ ! -d ${DESTDIR} ] ; then ERROR_COUNT++ ; fi #avoid false positive eos error if the directory was actually created
fi
arr_rpm=(`(shopt -s nocaseglob; ls ${SOURCEDIR}/*.rpm)`)
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap
old mode 100644
new mode 100755
diff --git a/Trigger/TrigT1/L1Common/cmt/fragments/l1common_files b/Trigger/TrigT1/L1Common/cmt/fragments/l1common_files
old mode 100644
new mode 100755
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen
old mode 100755
new mode 100644
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/components/TrigT1CaloEvent_load.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/components/TrigT1CaloEvent_load.cxx
old mode 100755
new mode 100644
--
GitLab