diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-03-17 11:09:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@baserock.org> | 2015-03-17 11:09:44 +0000 |
commit | cd7fa4119a3850541566b7d20d69515256e0b310 (patch) | |
tree | b8986b02d566f125a59ae2b3b610ead7d3f87e37 /morphlib/plugins/cross-bootstrap_plugin.py | |
parent | 60aedc8d97679159678e7ebad2f2d81768e9736a (diff) | |
parent | aab6f2b5d3621d5760145d133a72495ef2ac1f25 (diff) | |
download | morph-cd7fa4119a3850541566b7d20d69515256e0b310.tar.gz |
Merge "Use python3 compatible notation for catching exceptions"
Diffstat (limited to 'morphlib/plugins/cross-bootstrap_plugin.py')
-rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py index e1f566c2..79609cb5 100644 --- a/morphlib/plugins/cross-bootstrap_plugin.py +++ b/morphlib/plugins/cross-bootstrap_plugin.py @@ -65,7 +65,7 @@ class BootstrapSystemBuilder(morphlib.builder.BuilderBase): self.unpack_sources(fs_root) self.write_build_script(fs_root) self.create_tarball(handle, fs_root, system_name) - except BaseException, e: + except BaseException as e: logging.error(traceback.format_exc()) self.app.status(msg='Error while building bootstrap image', error=True) @@ -84,7 +84,7 @@ class BootstrapSystemBuilder(morphlib.builder.BuilderBase): with cache.get(chunk_artifact) as chunk_file: try: morphlib.bins.unpack_binary_from_file(chunk_file, dest) - except BaseException, e: + except BaseException as e: self.app.status( msg='Error unpacking binary chunk %(name)s', name=chunk_artifact.name, |