Fix output reordering when you get a conflict on an update....

Fix output reordering when you get a conflict on an update.

If you're not running gclient sync with --verbose and you get a conflict on
a file, the conflict message prints *before* the message that you're running
update in the appropriate directory. This is happening because we intercept
stdout but not stderr, and the conflict prompt goes to stderr. redirecting
stderr in the popen() to the pipe fixes this.

  R=maruel@chromium.org
  BUG=none
  TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31276

[M-A Ruel, 2009-11-05 23:40:48]

lgtm

On Nov 5, 2009 6:02 PM, <dpranke@chromium.org> wrote:

Reviewers: Marc-Antoine Ruel,

Description:
Fix output reordering when you get a conflict on an update.

If you're not running gclient sync with --verbose and you get a conflict on
a file, the conflict message prints *before* the message that you're running
update in the appropriate directory. This is happening because we intercept
stdout but not stderr, and the conflict prompt goes to stderr. redirecting
stderr in the popen() to the pipe fixes this.

 R=maruel@chromium.org
 BUG=none
 TEST=none


Please review this at http://codereview.chromium.org/373003

SVN Base: svn://chrome-svn/chrome/trunk/tools/depot_tools/

Affected files:
 M     gclient_utils.py


Index: gclient_utils.py
===================================================================
--- gclient_utils.py    (revision 31140)
+++ gclient_utils.py    (working copy)
@@ -209,7 +209,8 @@
  # executable, but shell=True makes subprocess on Linux fail when it's
called
  # with a list because it only tries to execute the first item in the list.
  kid = subprocess.Popen(command, bufsize=0, cwd=in_directory,
-      shell=(sys.platform == 'win32'), stdout=subprocess.PIPE)
+      shell=(sys.platform == 'win32'), stdout=subprocess.PIPE,
+      stderr=subprocess.STDOUT)

  # Also, we need to forward stdout to prevent weird re-ordering of output.
  # This has to be done on a per byte basis to make sure it is not buffered: