diff options
Diffstat (limited to 'morphlib/extractedtarball.py')
| -rw-r--r-- | morphlib/extractedtarball.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/morphlib/extractedtarball.py b/morphlib/extractedtarball.py index e435b1ef..fd98cd92 100644 --- a/morphlib/extractedtarball.py +++ b/morphlib/extractedtarball.py @@ -16,6 +16,7 @@ import cliapp import gzip +import logging import os import tempfile import shutil @@ -41,7 +42,9 @@ class ExtractedTarball(object): # pragma: no cover self.tempdir = tempfile.mkdtemp(dir=self.app.settings['tempdir']) try: morphlib.bins.unpack_binary(self.tarball, self.tempdir) - except: + except BaseException, e: + logging.error('Caught exception: %s' % str(e)) + logging.debug('Removing temporary directory %s' % self.tempdir) shutil.rmtree(self.tempdir) raise return self.tempdir @@ -51,8 +54,10 @@ class ExtractedTarball(object): # pragma: no cover tarball=os.path.basename(self.tarball), chatty=True) try: shutil.rmtree(self.tempdir) - except: - pass + except BaseException, e: + logging.warning( + 'Error when removing temporary directory %s: %s' % + (self.tempdir, str(e))) def __enter__(self): return self.setup() |