summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-11-01 05:44:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-16 10:33:34 +0000
commit8364558a2904d21c9b31d29bfb8f2d9cbeac8659 (patch)
tree4345015426bd213d995a06f40a1c225a52fa8347
parente02aa8e8b62eae0f83beca850466408dd060b248 (diff)
downloadopenembedded-core-8364558a2904d21c9b31d29bfb8f2d9cbeac8659.tar.gz
openembedded-core-8364558a2904d21c9b31d29bfb8f2d9cbeac8659.tar.bz2
openembedded-core-8364558a2904d21c9b31d29bfb8f2d9cbeac8659.zip
insane.bbclass:buildpaths: open() file with 'rb'
open() is default to 'rt' which may cause decoding errors when open binary file: $ bitbake xcursor-transparent-theme [snip] Exception: UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfd in position 18: invalid start byte [snip] (From OE-Core rev: ddbab61f47efd9b4fde38ef8f0f3482c78abe37c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/classes/insane.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 1d73778255..a5c93f33ff 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -647,8 +647,8 @@ def package_qa_check_buildpaths(path, name, d, elf, messages):
return
tmpdir = d.getVar('TMPDIR', True)
- with open(path) as f:
- file_content = f.read()
+ with open(path, 'rb') as f:
+ file_content = f.read().decode('utf-8', errors='ignore')
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))