diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
| commit | b7b24a7a3cd74bb165d28a2959ed9143e3648fbf (patch) | |
| tree | 062fd13092cee10dc8746a1339ecea18f08d21d6 /tools/patman/cros_subprocess.py | |
| parent | 1622559066d890f1b7622be0ede8a5d64de66ef3 (diff) | |
| parent | 22e10be456014400788f80d45fc5f5c0b9d4a81d (diff) | |
| download | u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.zip u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.tar.gz u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Here with some DM changes as well as the long-standing AT91 DM/DT
conversion patches which I have picked up via dm.
Diffstat (limited to 'tools/patman/cros_subprocess.py')
| -rw-r--r-- | tools/patman/cros_subprocess.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py index ebd4300..7c76014 100644 --- a/tools/patman/cros_subprocess.py +++ b/tools/patman/cros_subprocess.py @@ -190,6 +190,8 @@ class Popen(subprocess.Popen): # We will get an error on read if the pty is closed try: data = os.read(self.stdout.fileno(), 1024) + if isinstance(data, bytes): + data = data.decode('utf-8') except OSError: pass if data == "": @@ -205,6 +207,8 @@ class Popen(subprocess.Popen): # We will get an error on read if the pty is closed try: data = os.read(self.stderr.fileno(), 1024) + if isinstance(data, bytes): + data = data.decode('utf-8') except OSError: pass if data == "": |