patman: Avoid circular dependency between command and tools
PATCH v2 1/1 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 <[email protected]>
Signed-off-by Simon Glass <[email protected]>
---
Changes in v2:
- Update gitutil as well
tools/patman/command.py | 7 +++---- tools/patman/gitutil.py | 1 - 2 files changed, 3 insertions(+), 5 deletions(-)
tools/patman/command.py +3 -4
@@ -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
tools/patman/gitutil.py +0 -1
@@ -7,7 +7,6 @@ import os import subprocess import sys -from patman import checkpatch from patman import command from patman import series from patman import settings
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog