[gnome-continuous-yocto/gnomeostree-3.28-rocko: 77/8267] wic: get rid of inheritance Disk->DiskImage

[Emmanuele Bassi <ebassi src gnome org>]

commit 4daf903fb0398ee47825edf7d59d97beded9774f
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Apr 28 13:58:05 2016 +0300

    wic: get rid of inheritance Disk->DiskImage
    
    There is no need in this inheritance as DiskImage class
    is used only in one module and no other classes are inherited.
    
    (From OE-Core rev: 5af1d9bedc2c961eb91faf80251f24c3df754d76)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/fs_related.py |   43 +++++++---------------------------
 1 files changed, 9 insertions(+), 34 deletions(-)
---
diff --git a/scripts/lib/wic/utils/fs_related.py b/scripts/lib/wic/utils/fs_related.py
index 2658dcf..22aa294 100644
--- a/scripts/lib/wic/utils/fs_related.py
+++ b/scripts/lib/wic/utils/fs_related.py
@@ -32,47 +32,22 @@ def makedirs(dirname):
         if err.errno != errno.EEXIST:
             raise
 
-class Disk:
-    """
-    Generic base object for a disk.
-    """
-    def __init__(self, size, device=None):
-        self._device = device
-        self._size = size
-
-    def create(self):
-        pass
-
-    def cleanup(self):
-        pass
-
-    def get_device(self):
-        return self._device
-    def set_device(self, path):
-        self._device = path
-    device = property(get_device, set_device)
-
-    def get_size(self):
-        return self._size
-    size = property(get_size)
-
-
-class DiskImage(Disk):
+class DiskImage():
     """
     A Disk backed by a file.
     """
-    def __init__(self, image_file, size):
-        Disk.__init__(self, size)
-        self.image_file = image_file
+    def __init__(self, device, size):
+        self.size = size
+        self.device = device
+        self.created = False
 
     def exists(self):
-        return os.path.exists(self.image_file)
+        return os.path.exists(self.device)
 
     def create(self):
-        if self.device is not None:
+        if self.created:
             return
         # create sparse disk image
-        cmd = "truncate %s -s %s" % (self.image_file, self.size)
+        cmd = "truncate %s -s %s" % (self.device, self.size)
         exec_cmd(cmd)
-
-        self.device = self.image_file
+        self.created = True