Only adding the stderr to stdout when stderr is non-empty in TimedCom…

…mand
PanDAWMS · May 3, 2018 · 0c25085 · 0c25085
1 parent 11f040c
commit 0c25085
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -1 +1 @@
-PICARD 72.9
+PICARD 72.10
diff --git 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