mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

wic: Make _ptable_format public

Browse Source 
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

(From OE-Core rev: 72599b5500ebdd0c418a0ef1e2c93c833bd31d75)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-06-02 17:02:03 +03:00
committed by Richard Purdie
parent 179fb20603
commit 9682d8f21e
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/wic/imager/direct.py
+3 -3
View File
@@ -62,7 +62,7 @@ class DirectImageCreator(BaseImageCreator):
self.__disks = {} self.__disks = {}
self.__disk_format = "direct" self.__disk_format = "direct"
self._disk_names = [] self._disk_names = []
self._ptable_format = self.ks.handler.bootloader.ptable self.ptable_format = self.ks.handler.bootloader.ptable
self.oe_builddir = oe_builddir self.oe_builddir = oe_builddir
if image_output_dir: if image_output_dir:
@@ -83,7 +83,7 @@ class DirectImageCreator(BaseImageCreator):
if n == num: if n == num:
if p.no_table: if p.no_table:
return 0 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.. # account for logical partition numbering, ex. sda5..
return realnum + 1 return realnum + 1
return realnum return realnum
@@ -276,7 +276,7 @@ class DirectImageCreator(BaseImageCreator):
self._restore_fstab(fstab) self._restore_fstab(fstab)
self.__image.layout_partitions(self._ptable_format) self.__image.layout_partitions(self.ptable_format)
self.__imgdir = self.workdir self.__imgdir = self.workdir
for disk_name, disk in self.__image.disks.items(): for disk_name, disk in self.__image.disks.items():
scripts/lib/wic/plugins/source/bootimg-efi.py
+2 -2
View File
@@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage" kernel = "/bzImage"
if cr._ptable_format in ('msdos', 'gpt'): if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev rootstr = rootdev
else: else:
raise ImageError("Unsupported partition table format found") raise ImageError("Unsupported partition table format found")
@@ -106,7 +106,7 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage" kernel = "/bzImage"
if cr._ptable_format in ('msdos', 'gpt'): if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev rootstr = rootdev
else: else:
raise ImageError("Unsupported partition table format found") raise ImageError("Unsupported partition table format found")
scripts/lib/wic/plugins/source/bootimg-pcbios.py
+4 -4
View File
@@ -44,12 +44,12 @@ class BootimgPcbiosPlugin(SourcePlugin):
disk image. In this case, we install the MBR. disk image. In this case, we install the MBR.
""" """
mbrfile = "%s/syslinux/" % bootimg_dir mbrfile = "%s/syslinux/" % bootimg_dir
if cr._ptable_format == 'msdos': if cr.ptable_format == 'msdos':
mbrfile += "mbr.bin" mbrfile += "mbr.bin"
elif cr._ptable_format == 'gpt': elif cr.ptable_format == 'gpt':
mbrfile += "gptmbr.bin" mbrfile += "gptmbr.bin"
else: 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): 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) 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" kernel = "/vmlinuz"
syslinux_conf += "KERNEL " + kernel + "\n" syslinux_conf += "KERNEL " + kernel + "\n"
if cr._ptable_format in ('msdos', 'gpt'): if cr.ptable_format in ('msdos', 'gpt'):
rootstr = rootdev rootstr = rootdev
else: else:
raise ImageError("Unsupported partition table format found") raise ImageError("Unsupported partition table format found")
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+4 -4
View File
@@ -101,7 +101,7 @@ class RootfsPlugin(SourcePlugin):
syslinux_conf += "LABEL linux\n" syslinux_conf += "LABEL linux\n"
syslinux_conf += " KERNEL /boot/bzImage\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 rootstr = rootdev
else: else:
raise ImageError("Unsupported partition table format found") raise ImageError("Unsupported partition table format found")
@@ -170,13 +170,13 @@ class RootfsPlugin(SourcePlugin):
disk image. In this case, we install the MBR. disk image. In this case, we install the MBR.
""" """
mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/") mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/")
if image_creator._ptable_format == 'msdos': if image_creator.ptable_format == 'msdos':
mbrfile += "mbr.bin" mbrfile += "mbr.bin"
elif image_creator._ptable_format == 'gpt': elif image_creator.ptable_format == 'gpt':
mbrfile += "gptmbr.bin" mbrfile += "gptmbr.bin"
else: else:
msger.error("Unsupported partition table: %s" % \ msger.error("Unsupported partition table: %s" % \
image_creator._ptable_format) image_creator.ptable_format)
if not os.path.exists(mbrfile): if not os.path.exists(mbrfile):
msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile) msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile)