From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [wic][PATCH 2/6] wic: get rid of inheritance Disk->DiskImage
Date: Thu, 28 Apr 2016 10:14:53 +0300 [thread overview]
Message-ID: <1461827697-16934-2-git-send-email-ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <1461827697-16934-1-git-send-email-ed.bartosh@linux.intel.com>
There is no need in this inheritance as DiskImage class
is used only in one module and no other classes are inherited.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/utils/fs_related.py | 43 ++++++++-----------------------------
1 file 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
--
2.1.4
next prev parent reply other threads:[~2016-04-28 9:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 7:14 [wic][PATCH 1/6] wic: use truncate utility to create sparse file Ed Bartosh
2016-04-28 7:14 ` Ed Bartosh [this message]
2016-04-28 7:14 ` [wic][PATCH 3/6] wic: get rid of fs_related.makedirs Ed Bartosh
2016-04-28 7:14 ` [wic][PATCH 4/6] wic: moved DiskImage to direct.py Ed Bartosh
2016-04-28 7:14 ` [wic][PATCH 5/6] wic: add FIEMAP/SEEK_HOLE APIs from bmaptool Ed Bartosh
2016-04-28 7:14 ` [wic][PATCH 6/6] wic: use sparse_copy to copy partitions Ed Bartosh
2016-04-28 8:53 ` [wic][PATCH 1/6] wic: use truncate utility to create sparse file Ed Bartosh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461827697-16934-2-git-send-email-ed.bartosh@linux.intel.com \
--to=ed.bartosh@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.