commit d0c5c8bba8d0708ed1350f3ba8aa0a0a5a4fe3ed
author Mike Frysinger <vapier@chromium.org> Tue Dec 17 02:28:26 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Dec 17 19:37:39 2019 +0000
tree 258bf4f13acc987c53a072e96ee7fa9d1aaba4a4
parent ed1b95a44b38f2a2a1fe82747524344c7710074c

pre-upload: migrate away from combine_stdout_stderr

We're dropping this in favor of a more standard naming.

BUG=chromium:1006587
TEST=`repo upload` still works

Change-Id: Icc4e6d122f1f103078c61a83dc45f14dfdfda8ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/1971370
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index e5f61e3..9628730 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -22,6 +22,7 @@
 import re
 import sys
 import stat
+import subprocess
 
 from errors import (VerifyException, HookFailure, PrintErrorForProject,
                     PrintErrorsForCommit)
@@ -591,7 +592,7 @@
   for gofile in files:
     contents = _get_file_content(gofile, commit)
     output = _run_command(cmd=['gofmt', '-l'], input=contents.encode('utf-8'),
-                          combine_stdout_stderr=True)
+                          stderr=subprocess.STDOUT)
     if output:
       errors.append(gofile)
   if errors:
@@ -608,7 +609,7 @@
   for rustfile in files:
     contents = _get_file_content(rustfile, commit)
     output = _run_command(cmd=['rustfmt'], input=contents.encode('utf-8'),
-                          combine_stdout_stderr=True)
+                          stderr=subprocess.STDOUT)
     if output != contents:
       errors.append(rustfile)
   if errors:
@@ -1448,7 +1449,7 @@
                                   stdout=True,
                                   encoding='utf-8',
                                   errors='replace',
-                                  combine_stdout_stderr=True,
+                                  stderr=subprocess.STDOUT,
                                   check=False)
   if cmd_result.returncode:
     return HookFailure('clang-format.py errors/warnings\n\n' +
@@ -1475,7 +1476,7 @@
   cmd = [os.path.join(hooks_dir, 'checkpatch.pl')] + options + ['-']
   cmd_result = cros_build_lib.run(
       cmd, print_cmd=False, input=_get_patch(commit).encode('utf-8'),
-      stdout=True, combine_stdout_stderr=True, check=False, encoding='utf-8',
+      stdout=True, stderr=subprocess.STDOUT, check=False, encoding='utf-8',
       errors='replace')
   if cmd_result.returncode:
     return HookFailure('checkpatch.pl errors/warnings\n\n' + cmd_result.stdout)
@@ -1490,7 +1491,7 @@
   if files:
     hooks_dir = _get_hooks_dir()
     cmd = [os.path.join(hooks_dir, 'kernel-doc'), '-none'] + files
-    output = _run_command(cmd, combine_stdout_stderr=True)
+    output = _run_command(cmd, stderr=subprocess.STDOUT)
     if output:
       return HookFailure('kernel-doc errors/warnings:',
                          items=output.splitlines())
@@ -1646,7 +1647,7 @@
                                   stdout=True,
                                   encoding='utf-8',
                                   errors='replace',
-                                  combine_stdout_stderr=True,
+                                  stderr=subprocess.STDOUT,
                                   check=False)
   if cmd_result.returncode:
     stdout = cmd_result.stdout