commit 8199bdb11528968cc7707235b9e63049e5b33a02
author Ryan Cui <rcui@chromium.org> Thu Aug 30 13:10:31 2012 -0700
committer Ryan Cui <rcui@chromium.org> Mon Sep 10 18:47:58 2012 -0700
tree 4724355a9e12c230d8d545a4e2ad10b346dcce5a
parent 1c63d8f2edc001b4dd834341fccbdf2ed0c689b2

Add more protection to CleanStage from bad manifests.

Have CleanStage catch most exceptions generated by parsing the
manifest instead of just EnvironmentError.

BUG=chromium-os:23277
TEST=Verified manifest parse error leads to buildroot clobber.

Change-Id: I90679e8a8fae62d8bb9601ad9cc6c9d9e42bdaee
Reviewed-on: https://gerrit.chromium.org/gerrit/31927
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>

buildbot/cbuildbot_stages.py

diff --git a/buildbot/cbuildbot_stages.py b/buildbot/cbuildbot_stages.py
index 76d134f..a3c16a6 100644
--- a/buildbot/cbuildbot_stages.py
+++ b/buildbot/cbuildbot_stages.py
@@ -117,7 +117,9 @@
       try:
         manifest = cros_build_lib.ManifestCheckout.Cached(self._build_root,
                                                           search=False)
-      except EnvironmentError, e:
+      except (KeyboardInterrupt, MemoryError, SystemExit):
+        raise
+      except Exception, e:
         # Either there is no repo there, or the manifest isn't usable.  If the
         # directory exists, log the exception for debugging reasons.  Either
         # way, the checkout needs to be wiped since it's in an unknown