diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-03-01 10:35:15 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-01 20:58:29 +0000 |
| commit | 5264b9093876a595d9c69892c5124f2fc55804e6 (patch) | |
| tree | 41295665dfa216377f40baa93076ff6b58ef23ad /buildstream/_platform | |
| parent | d223c8f416aa5fe7fdf805baccf5a33e2a6c9992 (diff) | |
| download | buildstream-5264b9093876a595d9c69892c5124f2fc55804e6.tar.gz | |
Let subprocess decode stdout based on localebschubert/no-subprocess-decode
Subprocesses can return decoded strings if we give them a
"universal_newlines=True" argument. We can therefore offload that to
them, and not explicitly decode output ourselves.
This also fixes multiple bugs where we would not be respecting the
locale used by the user, and in some cases force it to "ascii".
Diffstat (limited to 'buildstream/_platform')
| -rw-r--r-- | buildstream/_platform/linux.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/buildstream/_platform/linux.py b/buildstream/_platform/linux.py index 702059a5d..85e810c26 100644 --- a/buildstream/_platform/linux.py +++ b/buildstream/_platform/linux.py @@ -143,8 +143,7 @@ class Linux(Platform): '--unshare-user', '--uid', '0', '--gid', '0', whoami, - ]) - output = output.decode('UTF-8').strip() + ], universal_newlines=True).strip() except subprocess.CalledProcessError: output = '' |