From cd195bdf5dd2c8ff03c58a63dcabe88b142d2a9c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 2 Jun 2018 21:30:33 +0200 Subject: oe-pkgdata-util: package-info: Re-add support for the --extra option Commit 64d3ce83 broke the --extra option. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- scripts/oe-pkgdata-util | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index a4e84138d7..e6c9df94e8 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -287,8 +287,11 @@ def lookup_recipe(args): def package_info(args): def parse_pkgdatafile(pkgdatafile): vars = ['PKGV', 'PKGE', 'PKGR', 'PN', 'PV', 'PE', 'PR', 'PKGSIZE'] + if args.extra: + vars += args.extra with open(pkgdatafile, 'r') as f: vals = dict() + extra = '' for line in f: for var in vars: m = re.match(var + '(?:_\S+)?:\s*(.+?)\s*$', line) @@ -306,7 +309,12 @@ def package_info(args): recipe_version = vals['PE'] + ":" + recipe_version if 'PR' in vals: recipe_version = recipe_version + "-" + vals['PR'] - print("%s %s %s %s %s" % (pkg, pkg_version, recipe, recipe_version, pkg_size)) + if args.extra: + for var in args.extra: + if var in vals: + val = re.sub(r'\s+', ' ', vals[var]) + extra += ' "%s"' % val + print("%s %s %s %s %s%s" % (pkg, pkg_version, recipe, recipe_version, pkg_size, extra)) # Handle both multiple arguments and multiple values within an arg (old syntax) packages = [] -- cgit 1.2.3-korg