From a4677863bc35f2d7968513cc4d9d302f463bff9b Mon Sep 17 00:00:00 2001
From: Wainer Vandelli <Wainer.Vandelli@cern.ch>
Date: Mon, 6 Sep 2010 16:14:15 +0000
Subject: [PATCH] Fix merged name building
---
Script/MergedMigratedNew.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Script/MergedMigratedNew.py b/Script/MergedMigratedNew.py
index 9bdaa0c..8069ebc 100644
--- a/Script/MergedMigratedNew.py
+++ b/Script/MergedMigratedNew.py
@@ -1,6 +1,6 @@
#!/bin/env python
-__version__='$Revision:$'
+__version__='$Revision$'
# $Source$
from SFOFileNameParser import SFOFileNameParser
@@ -69,13 +69,14 @@ Merged file name is:
if not success: return False
### Create the two type of name we expect (neglecting attempt number)
- notmerged = os.path.basename(castorfile).splitext()[0]
+ notmerged = os.path.splitext(os.path.basename(castorfile))[0]
+ notmerged = notmerged.replace('.daq.','.merge.')
merged = '.'.join(notmerged.split('.',6)[:-1]+['_SFO-ALL._0001'])
-
+
### Find all the files with the correct name
files = [f for f in all_files.split('\n')
if f and (notmerged in f or merged in f)]
-
+
if not files: return False
### Take the file with the highest attempt number
--
GitLab