diff --git a/Tools/PyJobTransforms/python/transform.py b/Tools/PyJobTransforms/python/transform.py index ff05cf059c22e24accfb9570bf8bddc1a714ccd0..ec2376c8338547907289e474822587260d062cdd 100644 --- a/Tools/PyJobTransforms/python/transform.py +++ b/Tools/PyJobTransforms/python/transform.py @@ -5,7 +5,7 @@ # @brief Main package for new style ATLAS job transforms # @details Core class for ATLAS job transforms # @author atlas-comp-transforms-dev@cern.ch -# @version $Id: transform.py 743343 2016-04-27 15:47:21Z graemes $ +# @version $Id: transform.py 756692 2016-06-21 16:52:38Z uworlika $ # __version__ = '$Revision' @@ -359,9 +359,11 @@ class transform(object): msg.debug('Now preparing to execute {0}'.format(executionStep)) executor = self._executorDictionary[executionStep['name']] executor.preExecute(input = executionStep['input'], output = executionStep['output']) - executor.execute() - executor.postExecute() - executor.validate() + try: + executor.execute() + executor.postExecute() + finally: + executor.validate() self.validateOutFiles() diff --git a/Tools/PyJobTransforms/python/trfArgClasses.py b/Tools/PyJobTransforms/python/trfArgClasses.py index 70cd5106058cfe240166954142c3b75623466d8c..45c5514cb672a0e149fc6e65dd321f8b040d18d7 100644 --- a/Tools/PyJobTransforms/python/trfArgClasses.py +++ b/Tools/PyJobTransforms/python/trfArgClasses.py @@ -3,7 +3,7 @@ ## @package PyJobTransforms.trfArgClasses # @brief Transform argument class definitions # @author atlas-comp-transforms-dev@cern.ch -# @version $Id: trfArgClasses.py 751312 2016-06-01 09:10:49Z graemes $ +# @version $Id: trfArgClasses.py 756978 2016-06-22 14:23:04Z graemes $ import argparse import bz2 @@ -1347,6 +1347,7 @@ class argBSFile(argAthenaFile): msg.debug('Post self-merge files are: {0}'.format(self._value)) self._resetMetadata(inputs + [output]) + return myMerger ## @brief POOL file class.