summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-02 17:02:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:10 +0100
commit9682d8f21e450c8f9e8bfa0a4077e14ef5d467da (patch)
tree56834880d3b6cdc5211376366c33f5d7d1d2f03f /scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
parent179fb20603b31708226649c860d60dc6fa427b11 (diff)
downloadpoky-9682d8f21e450c8f9e8bfa0a4077e14ef5d467da.tar.gz
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 (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>
Diffstat (limited to 'scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py')
-rw-r--r--scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index cdd7c84c12..50b221382c 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):
101 syslinux_conf += "LABEL linux\n" 101 syslinux_conf += "LABEL linux\n"
102 syslinux_conf += " KERNEL /boot/bzImage\n" 102 syslinux_conf += " KERNEL /boot/bzImage\n"
103 103
104 if image_creator._ptable_format in ('msdos', 'gpt'): 104 if image_creator.ptable_format in ('msdos', 'gpt'):
105 rootstr = rootdev 105 rootstr = rootdev
106 else: 106 else:
107 raise ImageError("Unsupported partition table format found") 107 raise ImageError("Unsupported partition table format found")
@@ -170,13 +170,13 @@ class RootfsPlugin(SourcePlugin):
170 disk image. In this case, we install the MBR. 170 disk image. In this case, we install the MBR.
171 """ 171 """
172 mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/") 172 mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/")
173 if image_creator._ptable_format == 'msdos': 173 if image_creator.ptable_format == 'msdos':
174 mbrfile += "mbr.bin" 174 mbrfile += "mbr.bin"
175 elif image_creator._ptable_format == 'gpt': 175 elif image_creator.ptable_format == 'gpt':
176 mbrfile += "gptmbr.bin" 176 mbrfile += "gptmbr.bin"
177 else: 177 else:
178 msger.error("Unsupported partition table: %s" % \ 178 msger.error("Unsupported partition table: %s" % \
179 image_creator._ptable_format) 179 image_creator.ptable_format)
180 180
181 if not os.path.exists(mbrfile): 181 if not os.path.exists(mbrfile):
182 msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile) 182 msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile)