28 lines
861 B
Diff
28 lines
861 B
Diff
From 63dec85b326c8b0adde5b811e668117f236fc14c Mon Sep 17 00:00:00 2001
|
|
From: maminjie <maminjie1@huawei.com>
|
|
Date: Mon, 26 Oct 2020 09:11:24 +0800
|
|
Subject: [PATCH] fix TypeError: must be str or None, not bytes
|
|
|
|
---
|
|
SConstruct | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index 1468913..9b811cc 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -719,8 +719,8 @@ def is_userspace_32bit(cpuinfo):
|
|
# /bin/mount: file format elf64-x86-64
|
|
# or like this:
|
|
# /bin/mount: file format elf32-powerpc
|
|
- for line in x.split(b'\n'):
|
|
- line = line.strip().decode()
|
|
+ for line in x.split('\n'):
|
|
+ line = line.strip()
|
|
if line.startswith(real_exe):
|
|
x, fmt = line.rsplit(None, 1)
|
|
answer = 'elf32' in fmt
|
|
--
|
|
2.23.0
|
|
|