Hide archive build output unless it fails.

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 re
 import signal
@@ skipping 16 matching lines @@
 
 
 class RunCommandError(Exception):
   """Error caught in RunCommand() method."""
   pass
 
 
 def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
                exit_code=False, redirect_stdout=False, redirect_stderr=False,
                cwd=None, input=None, enter_chroot=False, shell=False,
-               env=None, ignore_sigint=False):
+               env=None, ignore_sigint=False, combine_stdout_stderr=False):
   """Runs a command.
 
   Args:
     cmd: cmd to run.  Should be input to subprocess.Popen.
     print_cmd: prints the command before running it.
     error_ok: does not raise an exception on error.
     error_message: prints out this message when an error occurrs.
     exit_code: returns the return code of the shell command.
     redirect_stdout: returns the stdout.
     redirect_stderr: holds stderr output until input is communicated.
     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.
     shell: If shell is True, the specified command will be executed through
       the shell.
     env: If non-None, this is the environment for the new process.
     ignore_sigint: If True, we'll ignore signal.SIGINT before calling the
       child.  This is the desired behavior if we know our child will handle
       Ctrl-C.  If we don't do this, I think we and the child will both get
       Ctrl-C at the same time, which means we'll forcefully kill the child.
+    combine_stdout_stderr: Combines stdout and stdin streams into stdout.
 
   Returns:
     A CommandResult object.
 
   Raises:
     Exception:  Raises generic exception on error with optional error_message.
   """
   # Set default for variables.
   stdout = None
   stderr = None
   stdin = None
   cmd_result = CommandResult()
 
   # Modify defaults based on parameters.
   if redirect_stdout: stdout = subprocess.PIPE
   if redirect_stderr: stderr = subprocess.PIPE
+  if combine_stdout_stderr: stderr = subprocess.STDOUT
   # TODO(sosa): gpylint complains about redefining built-in 'input'.
   #   Can we rename this variable?
   if input: stdin = subprocess.PIPE
   if isinstance(cmd, basestring):
     if enter_chroot: cmd = './enter_chroot.sh -- ' + cmd
     cmd_str = cmd
   else:
     if enter_chroot: cmd = ['./enter_chroot.sh', '--'] + cmd
     cmd_str = ' '.join(cmd)
 
@@ skipping 261 matching lines @@
     except RunCommandException as e:
       if not error_ok and retry_count == num_retries:
         raise e
       else:
         Warning(str(e))
         if print_cmd:
           Info('PROGRAM(%s) -> RunCommand: retrying %r in dir %s' %
                (GetCallerName(), cmd, cwd))
 
   return output