[U-Boot] [PATCH 04/37] tools: Drop duplicate raise_on_error argument

Simon Glass sjg at chromium.org
Fri Jun 28 14:08:46 UTC 2019


If kwargs contains raise_on_error then this function generates an error
due to a duplicate argument. Fix this.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/patman/command.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/patman/command.py b/tools/patman/command.py
index 14edcdaffd2..16299f3f5be 100644
--- a/tools/patman/command.py
+++ b/tools/patman/command.py
@@ -108,8 +108,8 @@ def RunPipe(pipe_list, infile=None, outfile=None,
     return result
 
 def Output(*cmd, **kwargs):
-    raise_on_error = kwargs.get('raise_on_error', True)
-    return RunPipe([cmd], capture=True, raise_on_error=raise_on_error).stdout
+    kwargs['raise_on_error'] = kwargs.get('raise_on_error', True)
+    return RunPipe([cmd], capture=True, **kwargs).stdout
 
 def OutputOneLine(*cmd, **kwargs):
     raise_on_error = kwargs.pop('raise_on_error', True)
-- 
2.22.0.410.gd8fdbe21b5-goog



More information about the U-Boot mailing list