diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-03-13 13:02:24 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-03-16 16:34:55 +0000 |
| commit | aab6f2b5d3621d5760145d133a72495ef2ac1f25 (patch) | |
| tree | 561f7ca9b2ce8fd78fbf425d7b7fc3b7e12adcd5 /morphlib/plugins | |
| parent | db23e8e6406f98722d2d18bf61b8e85cd99415eb (diff) | |
| download | morph-aab6f2b5d3621d5760145d133a72495ef2ac1f25.tar.gz | |
Use python3 compatible notation for catching exceptions
Change-Id: Ibda7a938cd16e35517a531140f39ef4664d85c72
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/artifact_inspection_plugin.py | 2 | ||||
| -rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/plugins/artifact_inspection_plugin.py b/morphlib/plugins/artifact_inspection_plugin.py index f1f41b3a..b16f393c 100644 --- a/morphlib/plugins/artifact_inspection_plugin.py +++ b/morphlib/plugins/artifact_inspection_plugin.py @@ -162,7 +162,7 @@ class VersionGuesser(object): version = guesser.guess_version(repo, ref, tree) if version: break - except cliapp.AppException, err: + except cliapp.AppException as err: self.app.status(msg='%(repo)s: Failed to list files in %(ref)s', repo=repo, ref=ref, chatty=True) return version 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, |