[PATCHv2] oe-pkgdata-util: package-info: Allow extra variables to be displayed

[PATCHv2] oe-pkgdata-util: package-info: Allow extra variables to be displayed

[Peter Kjellerstedt]

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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
PATCHv2: Changed references to SRC_URI into LICENSE, since SRC_URI is
not an available variable in the pkgdata.

 scripts/oe-pkgdata-util | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 6255662a4b..87beecb9da 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -325,8 +325,14 @@ 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)
+
+        for val in args.extra:
+            src_uri = mappings[pkg][val].strip()
+            src_uri = re.sub(r'\s+', ' ', src_uri)
+            line += ' "%s"' % src_uri
+
+        items.append(line)
     print('\n'.join(items))
 
 def get_recipe_pkgs(pkgdata_dir, recipe, unpackaged):
@@ -530,6 +536,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',
-- 
2.12.0

Re: [PATCHv2] oe-pkgdata-util: package-info: Allow extra variables to be displayed

[Peter Kjellerstedt]

*ping*

//Peter

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Peter Kjellerstedt
> Sent: den 1 juni 2017 09:34
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCHv2] 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.
> 
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> PATCHv2: Changed references to SRC_URI into LICENSE, since SRC_URI is
> not an available variable in the pkgdata.
> 
>  scripts/oe-pkgdata-util | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
> index 6255662a4b..87beecb9da 100755
> --- a/scripts/oe-pkgdata-util
> +++ b/scripts/oe-pkgdata-util
> @@ -325,8 +325,14 @@ 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)
> +
> +        for val in args.extra:
> +            src_uri = mappings[pkg][val].strip()
> +            src_uri = re.sub(r'\s+', ' ', src_uri)
> +            line += ' "%s"' % src_uri
> +
> +        items.append(line)
>      print('\n'.join(items))
> 
>  def get_recipe_pkgs(pkgdata_dir, recipe, unpackaged):
> @@ -530,6 +536,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',
> --
> 2.12.0
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core