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>
29 lines
717 B
Diff
29 lines
717 B
Diff
From 22bd1e20cbd3c26d2e5dba76e3b0a95ff0a2e154 Mon Sep 17 00:00:00 2001
|
|
From: lingsheng <lingsheng@huawei.com>
|
|
Date: Tue, 22 Sep 2020 14:36:55 +0800
|
|
Subject: [PATCH 1/6] Fix crit encode TypeError
|
|
|
|
---
|
|
lib/py/cli.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/py/cli.py b/lib/py/cli.py
|
|
index da34302..966dd4e 100755
|
|
--- a/lib/py/cli.py
|
|
+++ b/lib/py/cli.py
|
|
@@ -16,7 +16,10 @@ def inf(opts):
|
|
|
|
def outf(opts):
|
|
if opts['out']:
|
|
- return open(opts['out'], 'w+')
|
|
+ if getattr(opts['func'], '__name__') == 'encode':
|
|
+ return open(opts['out'], 'wb+')
|
|
+ else:
|
|
+ return open(opts['out'], 'w+')
|
|
else:
|
|
return sys.stdout
|
|
|
|
--
|
|
1.8.3.1
|
|
|