[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4453/8267] wic: get rid of __rootfs_dir_to_dict method

[Emmanuele Bassi <ebassi src gnome org>]

commit 2db161f1c0df9ed5047804c396bc6ebfdb0840ef
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Jan 31 03:25:10 2017 +0200

    wic: get rid of __rootfs_dir_to_dict method
    
    Replaced class method __rootfs_dir_to_dict with a list
    comprehension.
    
    [YOCTO #10619]
    
    (From OE-Core rev: 266fd31410771db4c06539f7368c196a6d03000a)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct_plugin.py |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 91a9792..c6df5fb 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -53,21 +53,8 @@ class DirectPlugin(ImagerPlugin):
 
     name = 'direct'
 
-    @classmethod
-    def __rootfs_dir_to_dict(cls, rootfs_dirs):
-        """
-        Gets a string that contain 'connection=dir' splitted by
-        space and return a dict
-        """
-        krootfs_dir = {}
-        for rootfs_dir in rootfs_dirs.split(' '):
-            key, val = rootfs_dir.split('=')
-            krootfs_dir[key] = val
-
-        return krootfs_dir
-
-    @classmethod
-    def do_create(cls, opts, *args):
+    @staticmethod
+    def do_create(opts, *args):
         """
         Create direct image, called from creator as 'direct' cmd
         """
@@ -92,7 +79,9 @@ class DirectPlugin(ImagerPlugin):
 
         image_name = "%s-%s" % (splitext(basename(ksconf))[0],
                           strftime("%Y%m%d%H%M"))
-        krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
+
+        # parse possible 'rootfs=name' items
+        krootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' '))
 
         creator = DirectImageCreator(image_name, ksobj, oe_builddir,
                                      image_output_dir, krootfs_dir,