From b76b1bd404487df38fd99bc0d0e6a59acb10c9d3 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 8 Feb 2017 20:51:25 +0200 Subject: wic: partitionedfs: merged __format_disks and create Private method __format_disks is called only from create method making the code less readable. Merged the code into one method. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/utils/partitionedfs.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index 5fc5765d65..08ae52f3e5 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -238,7 +238,11 @@ class Image(): return exec_native_cmd(cmd, self.native_sysroot) - def __format_disks(self): + def create(self): + for dev in self.disks: + disk = self.disks[dev] + disk['disk'].create() + self.layout_partitions() for dev in self.disks: @@ -375,12 +379,3 @@ class Image(): partimage = image_file + '.p%d' % part['num'] os.rename(source, partimage) self.partimages.append(partimage) - - def create(self): - for dev in self.disks: - disk = self.disks[dev] - disk['disk'].create() - - self.__format_disks() - - return -- cgit 1.2.3-korg