separate disk and devices for everythingbaserock/pedroalvarez/rawdisk-to-device7

1 files changed, 12 insertions, 9 deletions

diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 8daf65fd..5c1b9790 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -48,22 +48,25 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
         if upgrade:
             self.upgrade_local_system(location, temp_root)
         else:
-            try:
-                if not self.is_device(location):
+            if not self.is_device(location):
+                try:
                     with self.disk_image_created(location):
                         self.format_btrfs(location)
                         self.create_system(temp_root, location)
                     self.status(msg='Disk image has been created at %s' % location)
-                else:
+                except Exception:
+                    self.status(msg='Failure to create disk image at %s' %
+                                     location)
+                    raise
+            else:
+                try:
                     self.format_btrfs(location)
                     self.create_system(temp_root, location)
                     self.status(msg='System deployed to %s' % location)
-            except Exception:
-                self.status(msg='Failure to create disk image at %s' %
-                                 location)
-                if os.path.exists(location):
-                    os.remove(location)
-                raise
+                except Exception:
+                    self.status(msg='Failure deploy system to %s' %
+                                     location)
+                    raise
 
     def upgrade_local_system(self, raw_disk, temp_root):
         self.complete_fstab_for_btrfs_layout(temp_root)