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 265 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