diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-07-11 15:09:48 +0200 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-07-11 16:54:17 +0200 |
| commit | 69f22f2384c53f5cef4cafb5b66f8d25c42247e9 (patch) | |
| tree | 488f286933add35f4f541bd9fdafa3bc1ecd33ad | |
| parent | 0adb9dd9b48caf4816ce570f521ba40dad8083a9 (diff) | |
| download | openembedded-core-contrib-69f22f2384c53f5cef4cafb5b66f8d25c42247e9.tar.gz | |
classes/buildhistory: handle packaged files with names containing spaces
The FILELIST field of the package info file in the buildhistory
repository is a space-separated list of all of the files in the package.
If a name of a file packaged by a recipe contains a space character then
of course the result was that we didn't handle its name properly. To fix
that, use quotes around any filename containing spaces and at the other
end use these quotes to extract the proper entries.
Fixes [YOCTO #12742].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 3 | ||||
| -rw-r--r-- | meta/lib/oe/buildhistory_analysis.py | 16 |
2 files changed, 14 insertions, 5 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 63980f72a5..2e5213e66e 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -77,6 +77,7 @@ python buildhistory_emit_pkghistory() { import re import json + import shlex import errno pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE') @@ -287,7 +288,7 @@ python buildhistory_emit_pkghistory() { dictval = json.loads(val) filelist = list(dictval.keys()) filelist.sort() - pkginfo.filelist = " ".join(filelist) + pkginfo.filelist = " ".join([shlex.quote(x) for x in filelist]) pkginfo.size = int(pkgdata['PKGSIZE']) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index ff7815d7c9..ad7fceb8bb 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -13,6 +13,7 @@ import os.path import difflib import git import re +import shlex import hashlib import collections import bb.utils @@ -115,10 +116,13 @@ class ChangeRecord: aitems = pkglist_combine(depvera) bitems = pkglist_combine(depverb) else: - aitems = self.oldvalue.split() - bitems = self.newvalue.split() if self.fieldname == 'FILELIST': + aitems = shlex.split(self.oldvalue) + bitems = shlex.split(self.newvalue) renamed_dirs, aitems, bitems = detect_renamed_dirs(aitems, bitems) + else: + aitems = self.oldvalue.split() + bitems = self.newvalue.split() removed = list(set(aitems) - set(bitems)) added = list(set(bitems) - set(aitems)) @@ -409,9 +413,13 @@ def compare_dict_blobs(path, ablob, bblob, report_all, report_ver): (depvera, depverb) = compare_pkg_lists(astr, bstr) if depvera == depverb: continue - alist = astr.split() + if key == 'FILELIST': + alist = shlex.split(astr) + blist = shlex.split(bstr) + else: + alist = astr.split() + blist = bstr.split() alist.sort() - blist = bstr.split() blist.sort() # We don't care about the removal of self-dependencies if pkgname in alist and not pkgname in blist: |