Merge branch 'liw/kill-bare-except'

Reviewed-by: Richard Maw

I, Lars, note that we have an old version of CoverageTestRunner
in Baserock. The new version hides the spurious logging messages.

1 files changed, 7 insertions, 2 deletions

diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 9aefabb6..59c62222 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -305,7 +305,9 @@ class ChunkBuilder(BuilderBase):
                     log_name = log.real_filename
                     self.run_commands(builddir, destdir, log)
                     self.create_devices(destdir)
-            except:
+            except BaseException, e:
+                logging.error('Caught exception: %s' % str(e))
+                logging.info('Cleaning up staging area')
                 self.staging_area.chroot_close()
                 if log_name:
                     with open(log_name) as f:
@@ -768,8 +770,11 @@ class DiskImageBuilder(SystemKindBuilder):  # pragma: no cover
                     shutil.copyfileobj(ifh, ofh, 1024 * 1024)
                     ofh.close()
 
-            except:
+            except BaseException, e:
+                logging.error('Caught exception: %s' % str(e))
+                logging.info('Removing unfinished disk image %s' % image_name)
                 os.remove(image_name)
+                logging.info('Removing unfinished file from cache')
                 handle.abort()
                 raise