From 6c691734ac0ec68ec502e56ca0964c9fbcf07eed Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Mon, 8 Nov 2021 09:26:52 +0100 Subject: [PATCH] Fix get_cnf if working on local machine get_cnf always returns latin1-encoded output, but wrapper decoded shell-output with system-default-encoding (usually utf8). Fix that --- src/arnied_wrapper.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/arnied_wrapper.py b/src/arnied_wrapper.py index 774e835..4d13c4c 100644 --- a/src/arnied_wrapper.py +++ b/src/arnied_wrapper.py @@ -430,7 +430,8 @@ def get_cnf(cnf_key, cnf_index=1, regex=".*", compact=False, timeout=30, vm=None cnf_index, cnf_key, platform_str, regex) cmd = "get_cnf%s %s%s" % (" -c " if compact else "", cnf_key, " %s" % cnf_index if cnf_index != -1 else "") - output = run_cmd(cmd=cmd, vm=vm).stdout.decode() + # get_cnf creates latin1-encoded output, transfer from VM removes non-ascii + output = run_cmd(cmd=cmd, vm=vm).stdout.decode('latin1') return re.search(regex, output, flags=re.DOTALL) -- 1.7.1