diff options
| author | Simon Glass <sjg@chromium.org> | 2020-06-07 06:45:46 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-07-09 18:57:21 -0600 |
| commit | ddd65b01561d6941f78363751d9713bc4cbb0cd1 (patch) | |
| tree | 574850cb2f869a71ac934c2f08359a26c4731e3f /tools/patman | |
| parent | 676f98a8703d50aeb4e9c51450707d7f7d106120 (diff) | |
patman: Avoid circular dependency between command and tools
This seems to cause problems in some cases. Split the dependency by
copying the code to command.
Reported-by: Stefan Bosch <stefan_b@posteo.net>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
| -rw-r--r-- | tools/patman/command.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/patman/command.py b/tools/patman/command.py index e67ac159e5..bf8ea6c8c3 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -5,7 +5,6 @@ import os from patman import cros_subprocess -from patman import tools """Shell command ease-ups for Python.""" @@ -35,9 +34,9 @@ class CommandResult: def ToOutput(self, binary): if not binary: - self.stdout = tools.ToString(self.stdout) - self.stderr = tools.ToString(self.stderr) - self.combined = tools.ToString(self.combined) + self.stdout = self.stdout.decode('utf-8') + self.stderr = self.stderr.decode('utf-8') + self.combined = self.combined.decode('utf-8') return self |