From 61496173ce5c9ec3d736cb8172143d5edbaa3344 Mon Sep 17 00:00:00 2001
From: Nils Erik Krumnack <nils.erik.krumnack@cern.ch>
Date: Thu, 24 Sep 2020 21:39:59 +0000
Subject: [PATCH] Merge branch '21.2-modifiedRucioOutput' into '21.2'
Accomodate new rucio output style in SampleHandler
See merge request atlas/athena!36686
(cherry picked from commit 8dec5a5b12211409b0c876719efabd6a592e9f1d)
6b85fed0 Remove space before colon in search patterns
---
.../D3PDTools/SampleHandler/Root/GridTools.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
index 284b8678216c..921541a9e737 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
@@ -497,10 +497,10 @@ namespace SH
RucioDownloadResult result;
result.did = readLine (output, "DID ");
- result.totalFiles = readLineUnsigned (output, "Total files : ");
- result.downloadedFiles = readLineUnsigned (output, "Downloaded files : ");
- result.alreadyLocal = readLineUnsigned (output, "Files already found locally : ");
- result.notDownloaded = readLineUnsigned (output, "Files that cannot be downloaded : ");
+ result.totalFiles = readLineUnsigned (output, "Total files: ");
+ result.downloadedFiles = readLineUnsigned (output, "Downloaded files: ");
+ result.alreadyLocal = readLineUnsigned (output, "Files already found locally: ");
+ result.notDownloaded = readLineUnsigned (output, "Files that cannot be downloaded: ");
return result;
}
--
GitLab