summaryrefslogtreecommitdiffstats
path: root/tools/patman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-07-08 13:18:23 -0600
committerSimon Glass <sjg@chromium.org>2019-07-23 20:27:57 -0700
commit512f4550d29547819ef41c7aa39689dafde5afef (patch)
tree08d4cbaea1ba66ba9d7582b6a98b7019c3ef0d38 /tools/patman
parentababe101d3797cdc6c1c8ab703ce4dc8fd9ac326 (diff)
downloadu-boot-512f4550d29547819ef41c7aa39689dafde5afef.tar.gz
u-boot-512f4550d29547819ef41c7aa39689dafde5afef.tar.xz
u-boot-512f4550d29547819ef41c7aa39689dafde5afef.zip
tools: Drop duplicate raise_on_error argument
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@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/command.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/patman/command.py b/tools/patman/command.py
index 14edcdaffd..16299f3f5b 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)