diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-02 17:02:03 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:59:10 +0100 |
commit | 9682d8f21e450c8f9e8bfa0a4077e14ef5d467da (patch) | |
tree | 56834880d3b6cdc5211376366c33f5d7d1d2f03f /scripts/lib/wic/imager | |
parent | 179fb20603b31708226649c860d60dc6fa427b11 (diff) | |
download | poky-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/imager')
-rw-r--r-- | scripts/lib/wic/imager/direct.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 9a7d0f5117..83f9688878 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py | |||
@@ -62,7 +62,7 @@ class DirectImageCreator(BaseImageCreator): | |||
62 | self.__disks = {} | 62 | self.__disks = {} |
63 | self.__disk_format = "direct" | 63 | self.__disk_format = "direct" |
64 | self._disk_names = [] | 64 | self._disk_names = [] |
65 | self._ptable_format = self.ks.handler.bootloader.ptable | 65 | self.ptable_format = self.ks.handler.bootloader.ptable |
66 | 66 | ||
67 | self.oe_builddir = oe_builddir | 67 | self.oe_builddir = oe_builddir |
68 | if image_output_dir: | 68 | if image_output_dir: |
@@ -83,7 +83,7 @@ class DirectImageCreator(BaseImageCreator): | |||
83 | if n == num: | 83 | if n == num: |
84 | if p.no_table: | 84 | if p.no_table: |
85 | return 0 | 85 | return 0 |
86 | if self._ptable_format == 'msdos' and realnum > 3: | 86 | if self.ptable_format == 'msdos' and realnum > 3: |
87 | # account for logical partition numbering, ex. sda5.. | 87 | # account for logical partition numbering, ex. sda5.. |
88 | return realnum + 1 | 88 | return realnum + 1 |
89 | return realnum | 89 | return realnum |
@@ -276,7 +276,7 @@ class DirectImageCreator(BaseImageCreator): | |||
276 | 276 | ||
277 | self._restore_fstab(fstab) | 277 | self._restore_fstab(fstab) |
278 | 278 | ||
279 | self.__image.layout_partitions(self._ptable_format) | 279 | self.__image.layout_partitions(self.ptable_format) |
280 | 280 | ||
281 | self.__imgdir = self.workdir | 281 | self.__imgdir = self.workdir |
282 | for disk_name, disk in self.__image.disks.items(): | 282 | for disk_name, disk in self.__image.disks.items(): |