Fix cleanup so we don't have to clobber as much when failures occur

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 subprocess
 import sys
 
 _STDOUT_IS_TTY = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
@@ skipping 16 matching lines @@
     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.
   Raises:
     Exception:  Raises generic exception 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('RunCommand: %s' % ' '.join(cmd))
 
-  proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
-                          stdout=stdout, stderr=stderr)
-  (output, error) = proc.communicate(input)
-  if exit_code:
-    return proc.returncode
+  try:
+    proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
+                            stdout=stdout, stderr=stderr)
+    (output, error) = proc.communicate(input)
+    if exit_code:
+      return proc.returncode
 
-  if not error_ok and proc.returncode:
-    raise Exception('Command "%s" failed.\n' % (' '.join(cmd)) +
-                    (error_message or error or output or ''))
+    if not error_ok and proc.returncode:
+      raise Exception('Command "%s" failed.\n' % (' '.join(cmd)) +
+                      (error_message or error or output or ''))
+  except Exception,e:

[petkov, 2010/08/31 16:27:19]

space after ,

+    if not error_ok:
+      raise
+    else:
+      Warning(str(e))
 
   return output
 
 
 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'
   BOLD_START = '\033[1m'
@@ skipping 44 matching lines @@
 
 
 def Info(message):
   """Emits a blue informational message and continues execution.
 
   Keyword arguments:
     message: The message to be emitted.
   """
   print >> sys.stderr, (
       Color(_STDOUT_IS_TTY).Color(Color.BLUE, '\nINFO: ' + message))