Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix Popen_safe write

This commit is contained in:
Zhangyuan Nie 2022-07-19 15:07:37 -04:00 committed by Jussi Pakkanen
parent 73985f98dc
commit fa71c38688
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mesonbuild/mesonlib/universal.py
View File

@ -1394,20 +1394,22 @@ def partition(pred: T.Callable[[_T], object], iterable: T.Iterable[_T]) -> T.Tup
def Popen_safe(args: T.List[str], write: T.Optional[str] = None, def Popen_safe(args: T.List[str], write: T.Optional[str] = None,
stdin: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.DEVNULL,
stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE,
stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE,
**kwargs: T.Any) -> T.Tuple['subprocess.Popen[str]', str, str]: **kwargs: T.Any) -> T.Tuple['subprocess.Popen[str]', str, str]:
import locale import locale
encoding = locale.getpreferredencoding() encoding = locale.getpreferredencoding()
# Redirect stdin to DEVNULL otherwise the command run by us here might mess # Stdin defaults to DEVNULL otherwise the command run by us here might mess
# up the console and ANSI colors will stop working on Windows. # up the console and ANSI colors will stop working on Windows.
if 'stdin' not in kwargs: # If write is not None, set stdin to PIPE so data can be sent.
kwargs['stdin'] = subprocess.DEVNULL if write is not None:
stdin = subprocess.PIPE
if not sys.stdout.encoding or encoding.upper() != 'UTF-8': if not sys.stdout.encoding or encoding.upper() != 'UTF-8':
p, o, e = Popen_safe_legacy(args, write=write, stdout=stdout, stderr=stderr, **kwargs) p, o, e = Popen_safe_legacy(args, write=write, stdin=stdin, stdout=stdout, stderr=stderr, **kwargs)
else: else:
p = subprocess.Popen(args, universal_newlines=True, close_fds=False, p = subprocess.Popen(args, universal_newlines=True, close_fds=False,
stdout=stdout, stderr=stderr, **kwargs) stdin=stdin, stdout=stdout, stderr=stderr, **kwargs)
o, e = p.communicate(write) o, e = p.communicate(write)
# Sometimes the command that we run will call another command which will be # Sometimes the command that we run will call another command which will be
# without the above stdin workaround, so set the console mode again just in # without the above stdin workaround, so set the console mode again just in
@ -1417,11 +1419,12 @@ def Popen_safe(args: T.List[str], write: T.Optional[str] = None,
def Popen_safe_legacy(args: T.List[str], write: T.Optional[str] = None, def Popen_safe_legacy(args: T.List[str], write: T.Optional[str] = None,
stdin: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.DEVNULL,
stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE,
stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE,
**kwargs: T.Any) -> T.Tuple['subprocess.Popen[str]', str, str]: **kwargs: T.Any) -> T.Tuple['subprocess.Popen[str]', str, str]:
p = subprocess.Popen(args, universal_newlines=False, close_fds=False, p = subprocess.Popen(args, universal_newlines=False, close_fds=False,
stdout=stdout, stderr=stderr, **kwargs) stdin=stdin, stdout=stdout, stderr=stderr, **kwargs)
input_ = None # type: T.Optional[bytes] input_ = None # type: T.Optional[bytes]
if write is not None: if write is not None:
input_ = write.encode('utf-8') input_ = write.encode('utf-8')