[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5022/8267] license: don't assume source files are UTF-8
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 5022/8267] license: don't assume source files are UTF-8
- Date: Sun, 17 Dec 2017 02:51:22 +0000 (UTC)
commit 0ed537f95b4675ea47a2d51d073f4836c9cea809
Author: Ross Burton <ross burton intel com>
Date: Wed Mar 8 14:30:13 2017 +0000
license: don't assume source files are UTF-8
We can't assume that source files are entirely UTF-8, so when copying the
license blocks open the file as binary instead of text.
[ YOCTO #11135 ]
(From OE-Core rev: b606e1430c36f1ad528fbfbbf9b8b6243390b879)
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/license.bbclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 0ff6560..81458e7 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -386,9 +386,9 @@ def copy_license_files(lic_files_paths, destdir):
if begin_idx is None and end_idx is None:
shutil.copyfile(src, dst)
else:
- with open(src, 'r') as src_f:
- with open(dst, 'w') as dst_f:
- dst_f.write(''.join(src_f.readlines()[begin_idx:end_idx]))
+ with open(src, 'rb') as src_f:
+ with open(dst, 'wb') as dst_f:
+ dst_f.write(b''.join(src_f.readlines()[begin_idx:end_idx]))
except Exception as e:
bb.warn("Could not copy license file %s to %s: %s" % (src, dst, e))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]