summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/bootimg-pcbios.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/bootimg-pcbios.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/bootimg-pcbios.py')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index ab62b7a9e9..1c3c6e605c 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):
44 disk image. In this case, we install the MBR. 44 disk image. In this case, we install the MBR.
45 """ 45 """
46 mbrfile = "%s/syslinux/" % bootimg_dir 46 mbrfile = "%s/syslinux/" % bootimg_dir
47 if cr._ptable_format == 'msdos': 47 if cr.ptable_format == 'msdos':
48 mbrfile += "mbr.bin" 48 mbrfile += "mbr.bin"
49 elif cr._ptable_format == 'gpt': 49 elif cr.ptable_format == 'gpt':
50 mbrfile += "gptmbr.bin" 50 mbrfile += "gptmbr.bin"
51 else: 51 else:
52 msger.error("Unsupported partition table: %s" % cr._ptable_format) 52 msger.error("Unsupported partition table: %s" % cr.ptable_format)
53 53
54 if not os.path.exists(mbrfile): 54 if not os.path.exists(mbrfile):
55 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) 55 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):
104 kernel = "/vmlinuz" 104 kernel = "/vmlinuz"
105 syslinux_conf += "KERNEL " + kernel + "\n" 105 syslinux_conf += "KERNEL " + kernel + "\n"
106 106
107 if cr._ptable_format in ('msdos', 'gpt'): 107 if cr.ptable_format in ('msdos', 'gpt'):
108 rootstr = rootdev 108 rootstr = rootdev
109 else: 109 else:
110 raise ImageError("Unsupported partition table format found") 110 raise ImageError("Unsupported partition table format found")