diff options
Diffstat (limited to 'scripts/oe-pkgdata-util')
| -rwxr-xr-x | scripts/oe-pkgdata-util | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 9cc78d1104..93220e3617 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util | |||
| @@ -389,21 +389,16 @@ def list_pkgs(args): | |||
| 389 | return False | 389 | return False |
| 390 | return True | 390 | return True |
| 391 | 391 | ||
| 392 | pkglist = [] | ||
| 392 | if args.recipe: | 393 | if args.recipe: |
| 393 | packages = get_recipe_pkgs(args.pkgdata_dir, args.recipe, args.unpackaged) | 394 | packages = get_recipe_pkgs(args.pkgdata_dir, args.recipe, args.unpackaged) |
| 394 | 395 | ||
| 395 | if args.runtime: | 396 | if args.runtime: |
| 396 | pkglist = [] | ||
| 397 | runtime_pkgs = lookup_pkglist(packages, args.pkgdata_dir, False) | 397 | runtime_pkgs = lookup_pkglist(packages, args.pkgdata_dir, False) |
| 398 | for rtpkgs in runtime_pkgs.values(): | 398 | for rtpkgs in runtime_pkgs.values(): |
| 399 | pkglist.extend(rtpkgs) | 399 | pkglist.extend(rtpkgs) |
| 400 | else: | 400 | else: |
| 401 | pkglist = packages | 401 | pkglist = packages |
| 402 | |||
| 403 | for pkg in pkglist: | ||
| 404 | if matchpkg(pkg): | ||
| 405 | found = True | ||
| 406 | print("%s" % pkg) | ||
| 407 | else: | 402 | else: |
| 408 | if args.runtime: | 403 | if args.runtime: |
| 409 | searchdir = 'runtime-reverse' | 404 | searchdir = 'runtime-reverse' |
| @@ -414,9 +409,13 @@ def list_pkgs(args): | |||
| 414 | for fn in files: | 409 | for fn in files: |
| 415 | if fn.endswith('.packaged'): | 410 | if fn.endswith('.packaged'): |
| 416 | continue | 411 | continue |
| 417 | if matchpkg(fn): | 412 | pkglist.append(fn) |
| 418 | found = True | 413 | |
| 419 | print("%s" % fn) | 414 | for pkg in sorted(pkglist): |
| 415 | if matchpkg(pkg): | ||
| 416 | found = True | ||
| 417 | print("%s" % pkg) | ||
| 418 | |||
| 420 | if not found: | 419 | if not found: |
| 421 | if args.pkgspec: | 420 | if args.pkgspec: |
| 422 | logger.error("Unable to find any package matching %s" % args.pkgspec) | 421 | logger.error("Unable to find any package matching %s" % args.pkgspec) |
