WIP Chromite supporting "LEGACY" mode, as requested by Anush.

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
 
 _STDOUT_IS_TTY = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
 
 # TODO(sosa):  Move logging to logging module.
 
 class RunCommandException(Exception):
   """Raised when there is an error in RunCommand."""
   pass
 
 
 def GetCallerName():
   """Returns the name of the calling module with __main__."""
   top_frame = inspect.stack()[-1][0]
   return os.path.basename(top_frame.f_code.co_filename)
 
 
 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, num_retries=0):
+               cwd=None, input=None, enter_chroot=False, num_retries=0,
+               env=None):
   """Runs a shell command.
 
   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.
     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.
     num_retries: the number of retries to perform before dying
+    env: If non-None, should be a mapping for the environment variables of the
+      command.  Useful syntax: env=dict(os.environ.items() + [('VAR', 'val')])
 
   Returns:
     If exit_code is True, returns the return code of the shell command.
     Else returns the output of the shell command.
 
   Raises:
     Exception:  Raises RunCommandException on error with optional error_message.
   """
   # Set default for variables.
   stdout = None
   stderr = None
   stdin = None
   output = ''
 
   # Modify defaults based on parameters.
   if redirect_stdout:  stdout = subprocess.PIPE
   if redirect_stderr:  stderr = subprocess.PIPE
   if input:  stdin = subprocess.PIPE
   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))
 
   for retry_count in range(num_retries + 1):
     try:
-      proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
+      proc = subprocess.Popen(cmd, cwd=cwd, env=env, stdin=stdin,
                               stdout=stdout, stderr=stderr)
       (output, error) = proc.communicate(input)
       if exit_code and retry_count == num_retries:
         return proc.returncode
 
       if proc.returncode == 0:
         break
 
       raise RunCommandException('Command "%r" failed.\n' % (cmd) +
                                 (error_message or error or output or ''))
@@ skipping 148 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