V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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:
Simon Glass 2014-09-05 19:00:09 -06:00
parent 6208fcef94
commit ddaf5c8f30
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/patman/command.py
View File

@ -48,6 +48,8 @@ def RunPipe(pipe_list, infile=None, outfile=None,
last_pipe = None last_pipe = None
pipeline = list(pipe_list) pipeline = list(pipe_list)
user_pipestr = '|'.join([' '.join(pipe) for pipe in pipe_list]) user_pipestr = '|'.join([' '.join(pipe) for pipe in pipe_list])
kwargs['stdout'] = None
kwargs['stderr'] = None
while pipeline: while pipeline:
cmd = pipeline.pop(0) cmd = pipeline.pop(0)
if last_pipe is not None: if last_pipe is not None:

8
tools/patman/gitutil.py
View File

@ -152,7 +152,8 @@ def Checkout(commit_hash, git_dir=None, work_tree=None, force=False):
if force: if force:
pipe.append('-f') pipe.append('-f')
pipe.append(commit_hash) 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: if result.return_code != 0:
raise OSError, 'git checkout (%s): %s' % (pipe, result.stderr) 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 commit_hash: Commit hash to check out
""" """
pipe = ['git', 'clone', git_dir, '.'] 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: if result.return_code != 0:
raise OSError, 'git clone: %s' % result.stderr raise OSError, 'git clone: %s' % result.stderr
@ -179,7 +181,7 @@ def Fetch(git_dir=None, work_tree=None):
if work_tree: if work_tree:
pipe.extend(['--work-tree', work_tree]) pipe.extend(['--work-tree', work_tree])
pipe.append('fetch') pipe.append('fetch')
result = command.RunPipe([pipe], capture=True) result = command.RunPipe([pipe], capture=True, capture_stderr=True)
if result.return_code != 0: if result.return_code != 0:
raise OSError, 'git fetch: %s' % result.stderr raise OSError, 'git fetch: %s' % result.stderr