[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6609/8267] oe-pkgdata-util: package-info: Allow extra variables to be displayed

[Emmanuele Bassi <ebassi src gnome org>]

commit 2d8e3e91203af165f89c30fdf13b5bd28cd822ed
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Mon Jul 3 12:14:59 2017 +0200

    oe-pkgdata-util: package-info: Allow extra variables to be displayed
    
    By specifying the -e <var> option one or multiple times, extra
    variables available in the pkgdata can be displayed, e.,g,
    `oe-pkgdata-util package-info -e SUMMARY -e LICENSE ...`. The extra
    variables displayed are quoted since some of them may contain
    whitespace.
    
    (From OE-Core rev: 6f054fcf08f6d5aeb6b5ade74ac5cc61a99fb8fe)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-pkgdata-util |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 6255662..677effe 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -325,8 +325,15 @@ def package_info(args):
             recipe_version = recipe_version + "-" + mappings[pkg]['PR']
         pkg_size = mappings[pkg]['PKGSIZE']
 
-        items.append("%s %s %s %s %s" %
-                     (pkg, pkg_version, recipe, recipe_version, pkg_size))
+        line = "%s %s %s %s %s" % (pkg, pkg_version, recipe, recipe_version, pkg_size)
+
+        if args.extra:
+            for var in args.extra:
+                val = mappings[pkg][var].strip()
+                val = re.sub(r'\s+', ' ', val)
+                line += ' "%s"' % val
+
+        items.append(line)
     print('\n'.join(items))
 
 def get_recipe_pkgs(pkgdata_dir, recipe, unpackaged):
@@ -530,6 +537,7 @@ def main():
                                           description='Looks up the specified runtime package(s) and display 
information')
     parser_package_info.add_argument('pkg', nargs='*', help='Runtime package name to look up')
     parser_package_info.add_argument('-f', '--file', help='Read package names from the specified file (one 
per line, first field only)')
+    parser_package_info.add_argument('-e', '--extra', help='Extra variables to display, e.g., LICENSE (can 
be specified multiple times)', action='append')
     parser_package_info.set_defaults(func=package_info)
 
     parser_find_path = subparsers.add_parser('find-path',