Merge branch 'danielfirth/S9121'

Reviewed by Lars Wirzenius
Reviewed by Richard Maw

1 files changed, 8 insertions, 2 deletions

diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index a74d6905..8723ac0c 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -46,8 +46,14 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
         if os.path.isfile(location):
             self.upgrade_local_system(location, temp_root)
         else:
-            self.create_local_system(temp_root, location)
-            self.status(msg='Disk image has been created at %s' % location)
+            try:
+                self.create_local_system(temp_root, location)
+                self.status(msg='Disk image has been created at %s' % location)
+            except Exception:
+                os.remove(location)
+                self.status(msg='Failure to create disk image at %s' %
+                                 location)
+                raise
 
     def upgrade_local_system(self, raw_disk, temp_root):
         mp = self.mount(raw_disk)