From: Simon Glass <sjg@chromium.org>
Date: Sun, 7 Jun 2020 12:45:46 +0000 (-0600)
Subject: patman: Avoid circular dependency between command and tools
X-Git-Tag: v2020.10~120^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddd65b01561d6941f78363751d9713bc4cbb0cd1;p=platform%2Fkernel%2Fu-boot.git

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>
---

diff --git a/tools/patman/command.py b/tools/patman/command.py
index e67ac15..bf8ea6c 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