diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-16 16:01:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-17 09:52:18 +0100 |
commit | a1190903e0a61a12c9854c96af918ae8d12c6327 (patch) | |
tree | e70fd8d865f322c0827c5671fecec15afe9892cf /scripts/oe-pkgdata-util | |
parent | 72a9ddf85876909d6f22582561a6e1c3a2ccf2fa (diff) | |
download | openembedded-core-contrib-a1190903e0a61a12c9854c96af918ae8d12c6327.tar.gz |
package/scripts: Fix FILES_INFO handling
There is a long standing bug where FILES_INFO isn't written into pkgdata
with a package suffix. This means if the files are read into the datastore
as intended, the last one "wins".
Fix this to work as intended. Most of the call sites using the data need
to be updated to handle this and the overrides change correctly.
Also fix some other problematic references noticed along the way.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-pkgdata-util')
-rwxr-xr-x | scripts/oe-pkgdata-util | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 94d44002ab..ffa3850b8b 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -431,7 +431,7 @@ def list_pkg_files(args): for line in f: if line.startswith('FILES_INFO:'): found = True - val = line.split(':', 1)[1].strip() + val = line.split(': ', 1)[1].strip() dictval = json.loads(val) if long: width = max(map(len, dictval), default=0) @@ -500,7 +500,7 @@ def find_path(args): with open(os.path.join(root,fn)) as f: for line in f: if line.startswith('FILES_INFO:'): - val = line.split(':', 1)[1].strip() + val = line.split(': ', 1)[1].strip() dictval = json.loads(val) for fullpth in dictval.keys(): if fnmatch.fnmatchcase(fullpth, args.targetpath): |