commit 2e93c90de37eb3ac9ddf439d422f5c94dc31619e
author Alexei Frolov <frolv@google.com> Thu Mar 05 15:02:08 2020 -0800
committer CQ Bot Account <commit-bot@chromium.org> Thu Mar 05 23:27:21 2020 +0000
tree f01cac77b11411bc761c8105b6cf00720961e4d0
parent a0ace999135e6588295e0536ecd5c9d294a349e9

pw_env_setup: Capture CIPD stderr

Prevent CIPD from spewing output to stderr unless it fails.

Change-Id: I9a377615f43b5e9883948bc13748c0553b1c7ac7

pw_env_setup/py/pw_env_setup/cipd_setup/update.py

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
index 3dfb9d5..e64b3a8 100755
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
@@ -146,7 +146,9 @@
         with tempfile.TemporaryFile(mode='w+') as temp:
             print(*cmd, file=temp)
             try:
-                subprocess.check_call(cmd, stdout=temp)
+                subprocess.check_call(cmd,
+                                      stdout=temp,
+                                      stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError:
                 temp.seek(0)
                 sys.stderr.write(temp.read())