summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-17 11:09:44 +0000
committerGerrit Code Review <gerrit@baserock.org>2015-03-17 11:09:44 +0000
commit2fc8e2ad8c7a8b80eab680f96d24115d0ce27b19 (patch)
tree351087381eb5a9f9954424fd71f494e4dfac8be8
parent6e5ad7342a40b078fc66e37a5f094e3f40c4d2ba (diff)
parent705845ad37abae8fe89f2d698e58e41ee863d807 (diff)
downloaddefinitions-2fc8e2ad8c7a8b80eab680f96d24115d0ce27b19.tar.gz
Merge "Use python3 compatible notation for catching exceptions"
-rw-r--r--writeexts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/writeexts.py b/writeexts.py
index 3382767c..129b2bc4 100644
--- a/writeexts.py
+++ b/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