From 512f4550d29547819ef41c7aa39689dafde5afef Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 13:18:23 -0600
Subject: [PATCH] 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>
---
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 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)
--
2.39.5