From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [wic][PATCH v2 11/20] wic: Call methods better way
Date: Tue, 30 Jun 2015 11:51:43 +0300 [thread overview]
Message-ID: <1435654312-18177-12-git-send-email-ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <1435654312-18177-1-git-send-email-ed.bartosh@linux.intel.com>
Shortened code by using getattr to obtain a method to call for
prepare_empty_partition_* and prepare_rootfs_* methods.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index e3ae3ce..0741bb2 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -160,8 +160,12 @@ class Wic_PartData(Mic_PartData):
self.prepare_swap_partition(cr_workdir, oe_builddir,
native_sysroot)
elif self.fstype:
- self.prepare_empty_partition(cr_workdir, oe_builddir,
- native_sysroot)
+ for prefix in ("ext", "btrfs", "vfat", "squashfs"):
+ if self.fstype.startswith(prefix):
+ method = getattr(self,
+ "prepare_empty_partition_" + prefix)
+ method(cr_workdir, oe_builddir, native_sysroot)
+ break
return
plugins = pluginmgr.get_source_plugins()
@@ -223,23 +227,11 @@ class Wic_PartData(Mic_PartData):
if os.path.isfile(rootfs):
os.remove(rootfs)
- if self.fstype.startswith("ext"):
- return self.prepare_rootfs_ext(rootfs, oe_builddir,
- rootfs_dir, native_sysroot,
- pseudo)
- elif self.fstype.startswith("btrfs"):
- return self.prepare_rootfs_btrfs(rootfs, oe_builddir,
- rootfs_dir, native_sysroot,
- pseudo)
-
- elif self.fstype.startswith("vfat"):
- return self.prepare_rootfs_vfat(rootfs, oe_builddir,
- rootfs_dir, native_sysroot,
- pseudo)
- elif self.fstype.startswith("squashfs"):
- return self.prepare_rootfs_squashfs(rootfs, oe_builddir,
- rootfs_dir, native_sysroot,
- pseudo)
+ for prefix in ("ext", "btrfs", "vfat", "squashfs"):
+ if self.fstype.startswith(prefix):
+ method = getattr(self, "prepare_rootfs_" + prefix)
+ return method(rootfs, oe_builddir, rootfs_dir,
+ native_sysroot, pseudo)
def prepare_rootfs_ext(self, rootfs, oe_builddir, rootfs_dir,
native_sysroot, pseudo):
@@ -391,23 +383,6 @@ class Wic_PartData(Mic_PartData):
return 0
- def prepare_empty_partition(self, cr_workdir, oe_builddir, native_sysroot):
- """
- Prepare an empty partition.
- """
- if self.fstype.startswith("ext"):
- return self.prepare_empty_partition_ext(cr_workdir, oe_builddir,
- native_sysroot)
- elif self.fstype.startswith("btrfs"):
- return self.prepare_empty_partition_btrfs(cr_workdir, oe_builddir,
- native_sysroot)
- elif self.fstype.startswith("vfat"):
- return self.prepare_empty_partition_vfat(cr_workdir, oe_builddir,
- native_sysroot)
- elif self.fstype.startswith("squashfs"):
- return self.prepare_empty_partition_squashfs(cr_workdir, oe_builddir,
- native_sysroot)
-
def prepare_empty_partition_ext(self, cr_workdir, oe_builddir,
native_sysroot):
"""
--
2.1.4
next prev parent reply other threads:[~2015-06-30 8:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 8:51 [wic][PATCH v2 00/20] miscellaneous fixes. poky-conrib:ed/wic/misc Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 01/20] wic: Fix misleading message Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 02/20] wic: Test rootfs plugin using image recipes Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 03/20] wic: Test rootfs plugin using rootfs paths Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 04/20] wic: Refactor getting bitbake variables Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 05/20] wic: Include mount point into image report Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 06/20] wic: Remove annoing debug message Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 07/20] wic: Turn off debug output for 'bitbake -e' Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 08/20] wic: Refactor prepare_rootfs API Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 09/20] wic: Rename partition images Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 10/20] wic: Get rid of useless variable 'image_rootfs' Ed Bartosh
2015-06-30 8:51 ` Ed Bartosh [this message]
2015-06-30 8:51 ` [wic][PATCH v2 12/20] wic: Refactor prepare_empty_partition API Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 13/20] wic: Remove duplicated code Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 14/20] wic: Fix naming conflict Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 15/20] wic: Add --uuid partition option Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 16/20] wic: Refactor fstab update code Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 17/20] wic: Remove __write_partition method Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 18/20] wic: Fix confusing error message Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 19/20] wic: Code cleanup: long lines, identation and whitespaces Ed Bartosh
2015-06-30 8:51 ` [wic][PATCH v2 20/20] wic: Code cleanup: unused imports 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=1435654312-18177-12-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox