commit 5d6b00fac64a829cca5637bb76abe618291b8b60
author Robert Iannucci <iannucci@chromium.org> Fri Jan 12 15:43:21 2018 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Jan 12 23:52:54 2018 +0000
tree fd09b8d8b675febabfe0b15cba2c7ac62233b9d3
parent 2377b01e6cd32c53402a4dfd08faa4177c276e50

[cit] Use subprocess2 to properly sink stdout.

This should fix the "halts mid-way" symptoms observed on linux.

R=agable@chromium.org, hinoka@chromium.org

Bug: 782543
Change-Id: Ia5254b7f8e73b5646f2782e36acc52b4772b095e
Reviewed-on: https://chromium-review.googlesource.com/865821
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>

cit.py

diff --git a/cit.py b/cit.py
index 46c5cce..177b7ed 100755
--- a/cit.py
+++ b/cit.py
@@ -12,14 +12,15 @@
 * Acts as an alias to infra.git/cipd/<executable>
 """
 
-# TODO(hinoka): Use cipd/glyco instead of git/gclient.
+# TODO(hinoka,iannucci): Pre-pack infra tools in cipd package with vpython spec.
 
 import argparse
 import sys
 import os
-import subprocess
 import re
 
+import subprocess2 as subprocess
+
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 GCLIENT = os.path.join(SCRIPT_DIR, 'gclient.py')
@@ -37,7 +38,7 @@
   try:
     cmd = [sys.executable, GCLIENT, 'revinfo']
     subprocess.check_call(
-        cmd, cwd=os.path.join(TARGET_DIR), stdout=subprocess.PIPE)
+        cmd, cwd=os.path.join(TARGET_DIR), stdout=subprocess.VOID)
   except subprocess.CalledProcessError:
     return True  # Gclient failed, definitely need to update.
   except OSError:
@@ -50,7 +51,7 @@
 
   subprocess.check_call(
       ['git', 'fetch', 'origin'], cwd=INFRA_DIR,
-      stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      stdout=subprocess.VOID, stderr=subprocess.STDOUT)
   origin_rev = get_git_rev(INFRA_DIR, 'origin/%s' % (branch,))
   return origin_rev != local_rev
 
@@ -67,11 +68,11 @@
     subprocess.check_call(
         [sys.executable, os.path.join(SCRIPT_DIR, 'fetch.py'), 'infra'],
         cwd=TARGET_DIR,
-        stdout=subprocess.PIPE)
+        stdout=subprocess.VOID)
   subprocess.check_call(
       [sys.executable, GCLIENT, 'sync', '--revision', 'origin/%s' % (branch,)],
       cwd=TARGET_DIR,
-      stdout=subprocess.PIPE)
+      stdout=subprocess.VOID)
   sys.stderr.write(' done.\n')
   sys.stderr.flush()