Merge MVP script into cbuildbot.

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 77 matching lines @@
   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)
 
   # Print out the command before running.
   if print_cmd:
-    Info('RunCommand: %s' % cmd_str)
+    if cwd:
+      Info('RunCommand: %s in %s' % (cmd_str, cwd))
+    else:
+      Info('RunCommand: %s' % cmd_str)
   cmd_result.cmd = cmd
 
   try:
     proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin, stdout=stdout,
                             stderr=stderr, shell=shell, env=env)
     if ignore_sigint:
       old_sigint = signal.signal(signal.SIGINT, signal.SIG_IGN)
     try:
       (cmd_result.output, cmd_result.error) = proc.communicate(input)
     finally:
@@ skipping 182 matching lines @@
   new_path = os.path.join('/home', os.getenv('USER'), 'trunk', relative_path)
   return new_path
 
 
 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 GetValueFromFile(filename, varname):

[dgarrett, 2011/04/11 20:53:13]

This method was left over from DJMM's changes, but it no longer used, so I just
pulled it.

+  """
+  Given a NAME, return the VALUE out of a file.  (NAME=VALUE)
+  or the awk equivalent:
+  $ awk -F= '/varname=/ {print $2}' filename
+  """
+  if os.path.isfile(filename):
+    file_obj = open(filename, 'r')
+  else:
+    file_obj = filename
+
+  for line in file_obj:
+    if line.startswith(varname + '='):
+      pat = line.split('=', 1)[1]
+      break
+  return pat.strip()
+
+
 class RunCommandException(Exception):
   """Raised when there is an error in OldRunCommand."""
   def __init__(self, msg, cmd):
     self.cmd = cmd
     Exception.__init__(self, msg)
 
   def __eq__(self, other):
     return (type(self) == type(other) and
             str(self) == str(other) and
             self.cmd == other.cmd)
@@ skipping 63 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