summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Hayama <hayama@lineo.co.jp>2023-07-27 17:56:26 +0900
committerSteve Sakoman <steve@sakoman.com>2023-08-07 04:40:44 -1000
commitcd1d34d5106c4484372552bb3cf93198f7b25d76 (patch)
treea6b614218cfcb3f5329b575bd0757adee0a6846e
parent1aae734721c24ce8df40e7e76af409ab507f72dc (diff)
downloadpoky-cd1d34d5106c4484372552bb3cf93198f7b25d76.tar.gz
cve-update-nvd2-native: always pass str for json.loads()
Currently json.loads() accepts one of the types str, bytes, or bytearray as an argument, but bytes and bytearrays have only been allowed since python 3.6. The version of Python3 provided by default on Ubuntu 16.04 and Debian 9.x is 3.5, so make raw_data type str to work correctly on these build hosts. (From OE-Core rev: e67d659847afe648de1b1eca2d19c4f6375dd12c) Signed-off-by: Yuta Hayama <hayama@lineo.co.jp> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/meta/cve-update-nvd2-native.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb
index 2f7dad7e82..67d76f75dd 100644
--- a/meta/recipes-core/meta/cve-update-nvd2-native.bb
+++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb
@@ -136,7 +136,7 @@ def nvd_request_next(url, api_key, args):
136 136
137 if (r.headers['content-encoding'] == 'gzip'): 137 if (r.headers['content-encoding'] == 'gzip'):
138 buf = r.read() 138 buf = r.read()
139 raw_data = gzip.decompress(buf) 139 raw_data = gzip.decompress(buf).decode("utf-8")
140 else: 140 else:
141 raw_data = r.read().decode("utf-8") 141 raw_data = r.read().decode("utf-8")
142 142