1 files changed, 1 insertions, 2 deletions
diff --git a/repo b/repo
index 18649b89..8030afbd 100755
--- a/repo
+++ b/repo
@@ -447,8 +447,7 @@ def run_command(cmd, **kwargs):
    except UnicodeError:
      print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output),
            file=sys.stderr)
-      # TODO(vapier): Once we require Python 3, use 'backslashreplace'.
+      return output.decode('utf-8', 'backslashreplace')
-      return output.decode('utf-8', 'replace')
  # Run & package the results.
  proc = subprocess.Popen(cmd, **kwargs)

diff --git a/repo b/repo index 18649b89..8030afbd 100755 --- a/repo +++ b/repo
@@ -447,8 +447,7 @@ def run_command(cmd, **kwargs):
447	except UnicodeError:	447	except UnicodeError:
448	print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output),	448	print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output),
449	file=sys.stderr)	449	file=sys.stderr)
450	# TODO(vapier): Once we require Python 3, use 'backslashreplace'.	450	return output.decode('utf-8', 'backslashreplace')
451	return output.decode('utf-8', 'replace')
452		451
453	# Run & package the results.	452	# Run & package the results.
454	proc = subprocess.Popen(cmd, **kwargs)	453	proc = subprocess.Popen(cmd, **kwargs)