summaryrefslogtreecommitdiff
path: root/morphlib/writeexts.py
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-13 13:02:24 +0000
committerJavier Jardón <jjardon@gnome.org>2015-03-16 16:34:55 +0000
commitaab6f2b5d3621d5760145d133a72495ef2ac1f25 (patch)
tree561f7ca9b2ce8fd78fbf425d7b7fc3b7e12adcd5 /morphlib/writeexts.py
parentdb23e8e6406f98722d2d18bf61b8e85cd99415eb (diff)
downloadmorph-aab6f2b5d3621d5760145d133a72495ef2ac1f25.tar.gz
Use python3 compatible notation for catching exceptions
Change-Id: Ibda7a938cd16e35517a531140f39ef4664d85c72
Diffstat (limited to 'morphlib/writeexts.py')
-rw-r--r--morphlib/writeexts.py4
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