commit 08f4d59e0b177d3d15b65f9826bbf05491b3841d
author Johnny(Jianning) Ding <jnd@chromium.org> Tue Apr 14 05:32:09 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 14 05:32:09 2020 +0000
tree 786178047b30ff05212c872351e3af1c1dd717ac
parent b71a96f818c66b5578fb7c4475b67ecdcb16937a

Decode the returned encoded bytes of subprocess.check_all/check_output.

Bug: 1068779
Change-Id: Ie399e134577732b441c37ca2083d72a66bb631c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2142745
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Johnny (Jianning) Ding <jnd@chromium.org>

git_drover.py

diff --git a/git_drover.py b/git_drover.py
index a865181..8407ec4 100755
--- a/git_drover.py
+++ b/git_drover.py
@@ -320,7 +320,10 @@
     stderr = None if self._verbose else _DEV_NULL_FILE
 
     try:
-      return run(['git'] + args, shell=False, cwd=cwd, stderr=stderr)
+      rv = run(['git'] + args, shell=False, cwd=cwd, stderr=stderr)
+      if sys.version_info.major == 3:
+        return rv.decode('utf-8', 'ignore')
+      return rv
     except (OSError, subprocess.CalledProcessError) as e:
       if error_message:
         raise Error(error_message)