aboutsummaryrefslogtreecommitdiff
path: root/tools/patman/command.py
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-07-24 16:24:50 -0400
committerTom Rini <trini@konsulko.com>2019-07-24 16:24:50 -0400
commitf9b65c76b4828efbf8093c6b02bee5af0045b98b (patch)
tree1429cb8e3cdfea42b63778ddf06ad0b33fb7bcf0 /tools/patman/command.py
parenta9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (diff)
parent44e02e39a91cd91aae5a28d90259d3a6996010bf (diff)
Merge tag 'dm-pull-24jul19-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Minor driver-model fixes and tweaks A few device-tree fixes Binman support for extracting files from an image
Diffstat (limited to 'tools/patman/command.py')
-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)