commit c04ddb987f5d4d075e671d057d1417281f7c39e7
author Mike Frysinger <vapier@chromium.org> Mon Dec 09 21:19:47 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Dec 10 21:00:39 2019 +0000
tree 58664da7055a231772f12db818dd8c0a06a86341
parent f8102c5a787b2fc6490be39dbf78bb748ffd6e70

cros_generate_sysroot: fix encoding handling

We capture output here so make sure it's UTF-8 for parsing.

BUG=chromium:997354
TEST=`./run_tests` passes

Change-Id: I8a404cc7d69a29154e487d1809dba372633fea99
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1959367
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_generate_sysroot.py

diff --git a/scripts/cros_generate_sysroot.py b/scripts/cros_generate_sysroot.py
index 694033d..8fc4530 100644
--- a/scripts/cros_generate_sysroot.py
+++ b/scripts/cros_generate_sysroot.py
@@ -91,7 +91,8 @@
       for pkg in self.options.package.split():
         cmd = ['qdepends', '-q', '-C', pkg]
         output = cros_build_lib.run(
-            cmd, extra_env={'ROOT': raw_sysroot}, capture_output=True).output
+            cmd, extra_env={'ROOT': raw_sysroot}, capture_output=True,
+            encoding='utf-8').stdout
 
         if output.count('\n') > 1:
           raise AssertionError('Too many packages matched for given pattern')