mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
patman: RunPipe() should not pipe stdout/stderr unless asked
RunPipe() currently pipes the output of stdout and stderr to a pty, but this is not the intended behaviour. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
6208fcef94
commit
ddaf5c8f30
2 changed files with 7 additions and 3 deletions
|
@ -48,6 +48,8 @@ def RunPipe(pipe_list, infile=None, outfile=None,
|
|||
last_pipe = None
|
||||
pipeline = list(pipe_list)
|
||||
user_pipestr = '|'.join([' '.join(pipe) for pipe in pipe_list])
|
||||
kwargs['stdout'] = None
|
||||
kwargs['stderr'] = None
|
||||
while pipeline:
|
||||
cmd = pipeline.pop(0)
|
||||
if last_pipe is not None:
|
||||
|
|
|
@ -152,7 +152,8 @@ def Checkout(commit_hash, git_dir=None, work_tree=None, force=False):
|
|||
if force:
|
||||
pipe.append('-f')
|
||||
pipe.append(commit_hash)
|
||||
result = command.RunPipe([pipe], capture=True, raise_on_error=False)
|
||||
result = command.RunPipe([pipe], capture=True, raise_on_error=False,
|
||||
capture_stderr=True)
|
||||
if result.return_code != 0:
|
||||
raise OSError, 'git checkout (%s): %s' % (pipe, result.stderr)
|
||||
|
||||
|
@ -163,7 +164,8 @@ def Clone(git_dir, output_dir):
|
|||
commit_hash: Commit hash to check out
|
||||
"""
|
||||
pipe = ['git', 'clone', git_dir, '.']
|
||||
result = command.RunPipe([pipe], capture=True, cwd=output_dir)
|
||||
result = command.RunPipe([pipe], capture=True, cwd=output_dir,
|
||||
capture_stderr=True)
|
||||
if result.return_code != 0:
|
||||
raise OSError, 'git clone: %s' % result.stderr
|
||||
|
||||
|
@ -179,7 +181,7 @@ def Fetch(git_dir=None, work_tree=None):
|
|||
if work_tree:
|
||||
pipe.extend(['--work-tree', work_tree])
|
||||
pipe.append('fetch')
|
||||
result = command.RunPipe([pipe], capture=True)
|
||||
result = command.RunPipe([pipe], capture=True, capture_stderr=True)
|
||||
if result.return_code != 0:
|
||||
raise OSError, 'git fetch: %s' % result.stderr
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue