From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Mon, 8 Nov 2021 08:26:52 +0000 (+0100)
Subject: Fix get_cnf if working on local machine
X-Git-Tag: v1.6.7~3
X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=6c691734ac0ec68ec502e56ca0964c9fbcf07eed

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
---

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)