wic: partitionedfs: get rid of __add_partition

3 lines long private method __add_partition is called only
from add_partition method. Merged them together to increase
readability.

(From OE-Core rev: b7fb20fffada61211dda6d41f99407618428f23c)

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 2017-02-08 20:51:26 +02:00 committed by Richard Purdie
parent b8354df789
commit 86e190a614
1 changed files with 4 additions and 10 deletions

View File

@ -80,15 +80,6 @@ class Image():
self.disks[disk_name]['disk'] = disk_obj
self.disks[disk_name]['identifier'] = identifier
def __add_partition(self, part):
""" This is a helper function for 'add_partition()' which adds a
partition to the internal list of partitions. """
assert not self._partitions_layed_out
self.partitions.append(part)
self.__add_disk(part['disk_name'])
def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
label=None, fsopts=None, boot=False, align=None, no_table=False,
part_type=None, uuid=None, system_id=None):
@ -117,7 +108,10 @@ class Image():
'uuid': uuid, # Partition UUID
'system_id': system_id} # Partition system id
self.__add_partition(part)
assert not self._partitions_layed_out
self.partitions.append(part)
self._add_disk(part['disk_name'])
def layout_partitions(self, ptable_format="msdos"):
""" Layout the partitions, meaning calculate the position of every