[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4634/8267] wic: partitionedfs: merged __format_disks and create

[Emmanuele Bassi <ebassi src gnome org>]

commit b8354df7898471d821b85111374671f9e577a086
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Feb 8 20:51:25 2017 +0200

    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.
    
    (From OE-Core rev: b76b1bd404487df38fd99bc0d0e6a59acb10c9d3)
    
    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>

 scripts/lib/wic/utils/partitionedfs.py |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 5fc5765..08ae52f 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