Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/checkpoint-restore/criu.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAdrian Reber <areber@redhat.com>2021-07-14 17:40:47 +0300
committerAndrei Vagin <avagin@gmail.com>2021-09-03 20:31:00 +0300
commit7e86519fe31541268b8059ebd8fe31042ec1e648 (patch)
tree625192e846ffde0b62f8e4c74bc04255fb9adcd6 /lib
parent5034885974cad089f73c51698e2022af272f15eb (diff)
lib: fix crit-recode msgque errors in Jenkins
b'test/dump/zdtm/static/msgque/63/1/ipcns-msg-11.img' encode fails: expected bytes-like object, not str b'test/dump/zdtm/static/msgque/63/1/ipcns-msg-11.img' pretty encode fails: expected bytes-like object, not str FAIL Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/py/images/images.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 80d8b4531..3ab52d56a 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -443,7 +443,10 @@ class ipc_msg_queue_handler:
f.write(struct.pack('i', size))
f.write(msg_str)
rounded = round_up(msg.msize, sizeof_u64)
- data = base64.decodebytes(extra[i + 1])
+ if (sys.version_info > (3, 0)):
+ data = base64.decodebytes(str.encode(extra[i + 1]))
+ else:
+ data = base64.decodebytes(extra[i + 1])
f.write(data[:msg.msize])
f.write(b'\0' * (rounded - msg.msize))