diff --git a/CHANGES b/CHANGES index 6fbc42d5..0e89891b 100644 --- a/CHANGES +++ b/CHANGES @@ -691,6 +691,13 @@ M movers/lsm_sitemover.py (6) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +72.10 - HOTFIX + +QMUL metadata fix +- Only adding the stderr to stdout when stderr is non-empty (to revent messed up metadata in storm mover), in run() (TimedCommand) + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + TODO: todo: remove the explicit usages of schedconfig.lfchost and replace with an experiment specific method (getFileCatalog()) diff --git a/PILOTVERSION b/PILOTVERSION index 496ef9f9..dcc1bbc8 100644 --- a/PILOTVERSION +++ b/PILOTVERSION @@ -1 +1 @@ -PICARD 72.9 \ No newline at end of file +PICARD 72.10 \ No newline at end of file diff --git a/TimerCommand.py b/TimerCommand.py index 65a802fe..a9aa602b 100644 --- a/TimerCommand.py +++ b/TimerCommand.py @@ -63,7 +63,8 @@ def target(): self.stderr = '' if not self.stdout: self.stdout = '' - self.stdout += " Error: " + self.stderr + if self.stderr and self.stderr != '': + self.stdout += " Error: " + self.stderr if self.process: returncode = self.process.returncode