commit b806e17eb27864a9719d4f03c4d1383c82a716ca
author Edward Lesmes <ehmaldonado@google.com> Tue Apr 28 18:59:38 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 28 18:59:38 2020 +0000
tree a10d9d0b3971fa0e8a3a0b2c3ef86832418422cb
parent d70aa16fd5af125fae7a397311b7ae1bee955c84

git-drover: Don't attempt to decode output of check_call.

When interactive is true, check_call is used instead of check_output,
and check_call doesn't return the command output.

Bug: 1074357
Change-Id: Ib9e761d41d754df58c9ee1f897dde173ce4d9eff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2170805
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

git_drover.py

diff --git a/git_drover.py b/git_drover.py
index 8407ec4..8507fdc 100755
--- a/git_drover.py
+++ b/git_drover.py
@@ -321,7 +321,7 @@
 
     try:
       rv = run(['git'] + args, shell=False, cwd=cwd, stderr=stderr)
-      if sys.version_info.major == 3:
+      if not interactive and sys.version_info.major == 3:
         return rv.decode('utf-8', 'ignore')
       return rv
     except (OSError, subprocess.CalledProcessError) as e: