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/writeexts.py | |
| parent | 60aedc8d97679159678e7ebad2f2d81768e9736a (diff) | |
| parent | aab6f2b5d3621d5760145d133a72495ef2ac1f25 (diff) | |
| download | morph-cd7fa4119a3850541566b7d20d69515256e0b310.tar.gz | |
Merge "Use python3 compatible notation for catching exceptions"
Diffstat (limited to 'morphlib/writeexts.py')
| -rw-r--r-- | morphlib/writeexts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 3382767c..129b2bc4 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -177,7 +177,7 @@ class WriteExtension(cliapp.Application): self.create_btrfs_system_layout( temp_root, mp, version_label='factory', disk_uuid=self.get_uuid(raw_disk)) - except BaseException, e: + except BaseException as e: sys.stderr.write('Error creating Btrfs system layout') raise @@ -279,7 +279,7 @@ class WriteExtension(cliapp.Application): cliapp.runcmd(['mount', location, mount_point]) else: cliapp.runcmd(['mount', '-o', 'loop', location, mount_point]) - except BaseException, e: + except BaseException as e: sys.stderr.write('Error mounting filesystem') os.rmdir(mount_point) raise |