summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-05-15 23:33:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:33 +0100
commit69eb0135878f0f9a73a55d0e5a31a5844b890690 (patch)
tree1d4fcfd58ed140cb38a6df3cf127d4a737e7ed92 /scripts
parent95a1d7aefa93de688fa69d37a5cd38a1ebcf0e29 (diff)
downloadpoky-69eb0135878f0f9a73a55d0e5a31a5844b890690.tar.gz
oe-pkgdata-util: lookup-recipe, package-info: Don't finish prematurely
If a package name exists in runtime-rprovides, lookup-recipe and package-info would finish after printing information about that package even if more packages were specified. (From OE-Core rev: 32c2a2ddb1614f978f511dfccb6cc3e9398df841) 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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-pkgdata-util4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index aea8a57516..5dd9588224 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -277,7 +277,7 @@ def lookup_recipe(args):
277 print("%s is in the RPROVIDES of %s:" % (pkg, f)) 277 print("%s is in the RPROVIDES of %s:" % (pkg, f))
278 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) 278 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f)
279 parse_pkgdatafile(pkgdatafile) 279 parse_pkgdatafile(pkgdatafile)
280 break 280 continue
281 pkgdatafile = os.path.join(args.pkgdata_dir, 'runtime-reverse', pkg) 281 pkgdatafile = os.path.join(args.pkgdata_dir, 'runtime-reverse', pkg)
282 if not os.path.exists(pkgdatafile): 282 if not os.path.exists(pkgdatafile):
283 logger.error("The following packages could not be found: %s" % pkg) 283 logger.error("The following packages could not be found: %s" % pkg)
@@ -341,7 +341,7 @@ def package_info(args):
341 print("%s is in the RPROVIDES of %s:" % (pkg, f)) 341 print("%s is in the RPROVIDES of %s:" % (pkg, f))
342 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) 342 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f)
343 parse_pkgdatafile(pkgdatafile) 343 parse_pkgdatafile(pkgdatafile)
344 break 344 continue
345 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime-reverse", pkg) 345 pkgdatafile = os.path.join(args.pkgdata_dir, "runtime-reverse", pkg)
346 if not os.path.exists(pkgdatafile): 346 if not os.path.exists(pkgdatafile):
347 logger.error("Unable to find any built runtime package named %s" % pkg) 347 logger.error("Unable to find any built runtime package named %s" % pkg)