From 2e3cb7aa647ac962af24554b9619f9165b38f1a5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 23:18:22 +0100 Subject: [PATCH] Implement better GPG output decoding --- debianmemberportfolio/model/keyringanalyzer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debianmemberportfolio/model/keyringanalyzer.py b/debianmemberportfolio/model/keyringanalyzer.py index 8af8962..9ea3fab 100644 --- a/debianmemberportfolio/model/keyringanalyzer.py +++ b/debianmemberportfolio/model/keyringanalyzer.py @@ -160,7 +160,11 @@ def process_keyrings(): stdout=subprocess.PIPE) fpr = None for line in proc.stdout.readlines(): - fpr = process_gpg_list_keys_line(line.decode('utf8'), fpr) + try: + line = line.decode('utf8') + except UnicodeDecodeError: + line = line.decode('iso8859-1') + fpr = process_gpg_list_keys_line(line, fpr) retcode = proc.wait() if retcode != 0: logging.error("subprocess ended with return code %d", retcode)