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/builder.py | |
parent | db23e8e6406f98722d2d18bf61b8e85cd99415eb (diff) | |
download | morph-aab6f2b5d3621d5760145d133a72495ef2ac1f25.tar.gz |
Use python3 compatible notation for catching exceptions
Change-Id: Ibda7a938cd16e35517a531140f39ef4664d85c72
Diffstat (limited to 'morphlib/builder.py')
-rw-r--r-- | morphlib/builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index 94eeacb8..04ebd149 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -289,7 +289,7 @@ class ChunkBuilder(BuilderBase): self.create_devices(destdir) os.rename(temppath, logpath) - except BaseException, e: + except BaseException as e: logging.error('Caught exception: %s' % str(e)) logging.info('Cleaning up staging area') self.staging_area.chroot_close() @@ -375,7 +375,7 @@ class ChunkBuilder(BuilderBase): if stdout: stdout.flush() - except cliapp.AppException, e: + except cliapp.AppException as e: if not stdout: with open(logfilepath, 'r') as log: self.app.output.write("%s failed\n" % step) @@ -656,7 +656,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover msg = error_message_for_containerised_commandline( argv, err, container_config) raise cliapp.AppException(msg) - except BaseException, e: + except BaseException as e: self.app.status( msg='Error while running system integration commands', error=True) |