[oe-commits] Ed Bartosh : wic: Make _ptable_format public
git at git.openembedded.org
git at git.openembedded.org
Thu Jun 11 23:00:46 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 72599b5500ebdd0c418a0ef1e2c93c833bd31d75
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=72599b5500ebdd0c418a0ef1e2c93c833bd31d75
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date: Tue Jun 2 17:02:03 2015 +0300
wic: Make _ptable_format public
Names with one leasding underscore considered protected in Python.
_ptable_format is accessed outside of its class.
Made it public by removing underscore.
This pylint warning should be fixed now:
Access to a protected member _ptable_format of a client class
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/lib/wic/imager/direct.py | 6 +++---
scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++--
scripts/lib/wic/plugins/source/bootimg-pcbios.py | 8 ++++----
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 9a7d0f5..83f9688 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -62,7 +62,7 @@ class DirectImageCreator(BaseImageCreator):
self.__disks = {}
self.__disk_format = "direct"
self._disk_names = []
- self._ptable_format = self.ks.handler.bootloader.ptable
+ self.ptable_format = self.ks.handler.bootloader.ptable
self.oe_builddir = oe_builddir
if image_output_dir:
@@ -83,7 +83,7 @@ class DirectImageCreator(BaseImageCreator):
if n == num:
if p.no_table:
return 0
- if self._ptable_format == 'msdos' and realnum > 3:
+ if self.ptable_format == 'msdos' and realnum > 3:
# account for logical partition numbering, ex. sda5..
return realnum + 1
return realnum
@@ -276,7 +276,7 @@ class DirectImageCreator(BaseImageCreator):
self._restore_fstab(fstab)
- self.__image.layout_partitions(self._ptable_format)
+ self.__image.layout_partitions(self.ptable_format)
self.__imgdir = self.workdir
for disk_name, disk in self.__image.disks.items():
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 22c7b0a..400e3a2 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage"
- if cr._ptable_format in ('msdos', 'gpt'):
+ if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev
else:
raise ImageError("Unsupported partition table format found")
@@ -106,7 +106,7 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage"
- if cr._ptable_format in ('msdos', 'gpt'):
+ if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev
else:
raise ImageError("Unsupported partition table format found")
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index ab62b7a..1c3c6e6 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -44,12 +44,12 @@ class BootimgPcbiosPlugin(SourcePlugin):
disk image. In this case, we install the MBR.
"""
mbrfile = "%s/syslinux/" % bootimg_dir
- if cr._ptable_format == 'msdos':
+ if cr.ptable_format == 'msdos':
mbrfile += "mbr.bin"
- elif cr._ptable_format == 'gpt':
+ elif cr.ptable_format == 'gpt':
mbrfile += "gptmbr.bin"
else:
- msger.error("Unsupported partition table: %s" % cr._ptable_format)
+ msger.error("Unsupported partition table: %s" % cr.ptable_format)
if not os.path.exists(mbrfile):
msger.error("Couldn't find %s. If using the -e option, do you have the right MACHINE set in local.conf? If not, is the bootimg_dir path correct?" % mbrfile)
@@ -104,7 +104,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
kernel = "/vmlinuz"
syslinux_conf += "KERNEL " + kernel + "\n"
- if cr._ptable_format in ('msdos', 'gpt'):
+ if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev
else:
raise ImageError("Unsupported partition table format found")
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index cdd7c84..50b2213 100644
--- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
@@ -101,7 +101,7 @@ class RootfsPlugin(SourcePlugin):
syslinux_conf += "LABEL linux\n"
syslinux_conf += " KERNEL /boot/bzImage\n"
- if image_creator._ptable_format in ('msdos', 'gpt'):
+ if image_creator.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev
else:
raise ImageError("Unsupported partition table format found")
@@ -170,13 +170,13 @@ class RootfsPlugin(SourcePlugin):
disk image. In this case, we install the MBR.
"""
mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/")
- if image_creator._ptable_format == 'msdos':
+ if image_creator.ptable_format == 'msdos':
mbrfile += "mbr.bin"
- elif image_creator._ptable_format == 'gpt':
+ elif image_creator.ptable_format == 'gpt':
mbrfile += "gptmbr.bin"
else:
msger.error("Unsupported partition table: %s" % \
- image_creator._ptable_format)
+ image_creator.ptable_format)
if not os.path.exists(mbrfile):
msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile)
More information about the Openembedded-commits
mailing list