Add a verbose option to RunCommandCaptureOutput. Not used yet, does not

lib/cros_build_lib.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Common python commands used by various build scripts."""
 
 import inspect
 import os
 import subprocess
 import sys
@@ skipping 77 matching lines @@
         Warning(str(e))
         if print_cmd:
           Info('PROGRAM(%s) -> RunCommand: retrying %r in dir %s' %
                (GetCallerName(), cmd, cwd))
 
   return output
 
 
 def RunCommandCaptureOutput(cmd, print_cmd=True, cwd=None, input=None,
                             enter_chroot=False,
-                            combine_stdout_stderr=True):
+                            combine_stdout_stderr=True,
+                            verbose=False):
   """Runs a shell command. Differs from RunCommand, because it allows
      you to run a command and capture the exit code, output, and stderr
      all at the same time.
 
   Arguments:
     cmd: cmd to run.  Should be input to subprocess.POpen.  If a string,
       converted to an array using split().
     print_cmd: prints the command before running it.
     cwd: the working directory to run this cmd.
     input: input to pipe into this command through stdin.
     enter_chroot: this command should be run from within the chroot.  If set,
       cwd must point to the scripts directory.
     combine_stdout_stderr -- combine outputs together.
+    verbose -- also echo cmd.stdout and cmd.stderr to stdout and stderr
 
   Returns:
     Returns a tuple: (exit_code, stdout, stderr) (integer, string, string)
     stderr is None if combine_stdout_stderr is True
   """
   # Set default for variables.
   stdout = subprocess.PIPE
   stderr = subprocess.PIPE
   stdin = None
 
   # Modify defaults based on parameters.
   if input:  stdin = subprocess.PIPE
   if combine_stdout_stderr: stderr = subprocess.STDOUT
 
   if enter_chroot:  cmd = ['./enter_chroot.sh', '--'] + cmd
 
   # Print out the command before running.
   if print_cmd:
     Info('PROGRAM(%s) -> RunCommand: %r in dir %s' %
          (GetCallerName(), cmd, cwd))
 
   proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
                           stdout=stdout, stderr=stderr)
-  (output, error) = proc.communicate(input)
+  output, error = proc.communicate(input)

[sosa, 2011/01/20 03:40:55]

I'm not sure this completely helps us because if the command hangs, we're kinda
stuck with no output (from the builders).

Perhaps have the command redirect to a file and RunCommand tail -f and
--pid=<pid>

+
+  if verbose:
+    if output: sys.stdout.write(output)
+    if error: sys.stderr.write(error)
 
   # Error is None if stdout, stderr are combined.
   return proc.returncode, output, error
 
 
 class Color(object):
   """Conditionally wraps text in ANSI color escape sequences."""
   BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
   BOLD = -1
   COLOR_START = '\033[1;%dm'
@@ skipping 86 matching lines @@
   root_abs_path = os.path.abspath(root_path)
 
   # Strip the repository root from the path and strip first /.
   relative_path = path_abs_path.replace(root_abs_path, '')[1:]
 
   if relative_path == path_abs_path:
     raise Exception('Error: path is outside your src tree, cannot reinterpret.')
 
   new_path = os.path.join('/home', os.getenv('USER'), 'trunk', relative_path)
   return new_path