diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-12 14:44:06 +0100 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:09:29 +0100 | 
| commit | ffb52d383bfe413cf31fef13663fe9937a146c76 (patch) | |
| tree | 7ef5b53a7c0d3eeef72456a05df399ef2ce0c385 | |
| parent | 99e50d9e53ab23fc643c46378fa8c36190995335 (diff) | |
| download | openembedded-core-ffb52d383bfe413cf31fef13663fe9937a146c76.tar.gz openembedded-core-ffb52d383bfe413cf31fef13663fe9937a146c76.tar.bz2 openembedded-core-ffb52d383bfe413cf31fef13663fe9937a146c76.zip | |
insane: optimise buildpath search
Instead of decoding every file we open as UTF-8 (with many errors as machine
code isn't UTF-8), convert the build path to the UTF-8 byte representation and
search for that instead.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/insane.bbclass | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 713b40eac4..469d5c4cd5 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -535,9 +535,9 @@ def package_qa_check_buildpaths(path, name, d, elf, messages):      if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1:          return -    tmpdir = d.getVar('TMPDIR') +    tmpdir = bytes(d.getVar('TMPDIR'), encoding="utf-8")      with open(path, 'rb') as f: -        file_content = f.read().decode('utf-8', errors='ignore') +        file_content = f.read()          if tmpdir in file_content:              package_qa_add_message(messages, "buildpaths", "File %s in package contained reference to tmpdir" % package_qa_clean_path(path,d)) | 
