From 3c7bff4992691ac30ec11dbf028b3507489812d7 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 28 May 2018 17:00:54 +0100
Subject: [PATCH] RF: Changed default stream handling for cmdwrapper/fslwrapper
decorators
---
fsl/wrappers/wrapperutils.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fsl/wrappers/wrapperutils.py b/fsl/wrappers/wrapperutils.py
index a1bc938d9..cfeed50ff 100644
--- a/fsl/wrappers/wrapperutils.py
+++ b/fsl/wrappers/wrapperutils.py
@@ -142,8 +142,10 @@ def cmdwrapper(func):
"""
def wrapper(*args, **kwargs):
submit = kwargs.pop('submit', None)
- cmd = func(*args, **kwargs)
- return run.run(cmd, err=True, submit=submit)
+ stderr = kwargs.pop('stderr', True)
+ log = kwargs.pop('log', {'tee' : True})
+ cmd = func(*args, **kwargs)
+ return run.run(cmd, stderr=stderr, log=log, submit=submit)
return _update_wrapper(wrapper, func)
@@ -154,8 +156,10 @@ def fslwrapper(func):
"""
def wrapper(*args, **kwargs):
submit = kwargs.pop('submit', None)
- cmd = func(*args, **kwargs)
- return run.runfsl(cmd, err=True, submit=submit)
+ stderr = kwargs.pop('stderr', True)
+ log = kwargs.pop('log', {'tee' : True})
+ cmd = func(*args, **kwargs)
+ return run.runfsl(cmd, stderr=stderr, log=log, submit=submit)
return _update_wrapper(wrapper, func)
--
GitLab