ed92fb125a
upstream backport: - 0005-vdso-fix-segmentation-fault-caused-by-char-pointer-a.patch * commit id: 2cb1156 feature: - 0004-criu-dump-and-restore-cpu-affinity-of-each-thread.patch * support checkpoint/restore cpu affinity - 0006-criu-add-pin-memory-method.patch * support kernel feature pin memory option Signed-off-by: fu.lin <fulin10@huawei.com>
26 lines
590 B
Diff
26 lines
590 B
Diff
From 4f139d2803773c86e5cf557c879392e7b79238b3 Mon Sep 17 00:00:00 2001
|
|
From: lingsheng <lingsheng@huawei.com>
|
|
Date: Tue, 22 Sep 2020 14:40:35 +0800
|
|
Subject: [PATCH 3/6] Fix crit x UnicodeDecodeError
|
|
|
|
---
|
|
lib/py/cli.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/py/cli.py b/lib/py/cli.py
|
|
index 966dd4e..f7bda23 100755
|
|
--- a/lib/py/cli.py
|
|
+++ b/lib/py/cli.py
|
|
@@ -25,7 +25,7 @@ def outf(opts):
|
|
|
|
|
|
def dinf(opts, name):
|
|
- return open(os.path.join(opts['dir'], name))
|
|
+ return open(os.path.join(opts['dir'], name), 'rb')
|
|
|
|
|
|
def decode(opts):
|
|
--
|
|
1.8.3.1
|
|
|