diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/oe-pkgdata-util | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index b075775b8f..116cfae742 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util | |||
@@ -60,6 +60,7 @@ def glob(args): | |||
60 | skipval += "|" + args.exclude | 60 | skipval += "|" + args.exclude |
61 | skipregex = re.compile(skipval) | 61 | skipregex = re.compile(skipval) |
62 | 62 | ||
63 | skippedpkgs = set() | ||
63 | mappedpkgs = set() | 64 | mappedpkgs = set() |
64 | with open(args.pkglistfile, 'r') as f: | 65 | with open(args.pkglistfile, 'r') as f: |
65 | for line in f: | 66 | for line in f: |
@@ -73,6 +74,7 @@ def glob(args): | |||
73 | # Skip packages for which there is no point applying globs | 74 | # Skip packages for which there is no point applying globs |
74 | if skipregex.search(pkg): | 75 | if skipregex.search(pkg): |
75 | logger.debug("%s -> !!" % pkg) | 76 | logger.debug("%s -> !!" % pkg) |
77 | skippedpkgs.add(pkg) | ||
76 | continue | 78 | continue |
77 | 79 | ||
78 | # Skip packages that already match the globs, so if e.g. a dev package | 80 | # Skip packages that already match the globs, so if e.g. a dev package |
@@ -84,6 +86,7 @@ def glob(args): | |||
84 | already = True | 86 | already = True |
85 | break | 87 | break |
86 | if already: | 88 | if already: |
89 | skippedpkgs.add(pkg) | ||
87 | logger.debug("%s -> !" % pkg) | 90 | logger.debug("%s -> !" % pkg) |
88 | continue | 91 | continue |
89 | 92 | ||
@@ -152,7 +155,7 @@ def glob(args): | |||
152 | 155 | ||
153 | logger.debug("------") | 156 | logger.debug("------") |
154 | 157 | ||
155 | print("\n".join(mappedpkgs)) | 158 | print("\n".join(mappedpkgs - skippedpkgs)) |
156 | 159 | ||
157 | def read_value(args): | 160 | def read_value(args): |
158 | # Handle both multiple arguments and multiple values within an arg (old syntax) | 161 | # Handle both multiple arguments and multiple values within an arg (old syntax) |