From be3849f0b275154e3e3f46c8740fbfc67e654b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 18 Feb 2021 13:23:21 +0100 Subject: [PATCH] px4_mkfw.py: fix byte to string conversion --- Tools/px_mkfw.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/px_mkfw.py b/Tools/px_mkfw.py index b6638eeffd..3f005f7d42 100755 --- a/Tools/px_mkfw.py +++ b/Tools/px_mkfw.py @@ -101,11 +101,11 @@ if args.description != None: if args.git_identity != None: cmd = "git --git-dir '{:}/.git' describe --exclude ext/* --always --tags".format(args.git_identity) p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout - desc['git_identity'] = str(p.read().strip()) + desc['git_identity'] = p.read().strip().decode('utf-8') p.close() cmd = "git --git-dir '{:}/.git' rev-parse --verify HEAD".format(args.git_identity) p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout - desc['git_hash'] = str(p.read().strip()) + desc['git_hash'] = p.read().strip().decode('utf-8') p.close() if args.parameter_xml != None: f = open(args.parameter_xml, "rb")