kgpg: fix importing keys using GnuPG 2.1

From: Rolf Eike Beer <kde@opensource.sf-tec.de>
Date: Sat, 27 Dec 2014 18:36:12 +0000
Subject: fix importing keys using GnuPG 2.1
X-Git-Tag: v14.12.1
X-Git-Url: http://quickgit.kde.org/?p=kgpg.git&a=commitdiff&h=dfd166f04c2567133f06c1963f69dbdcb0a94030
---
fix importing keys using GnuPG 2.1

More fields at the end of GnuPG output may be introduced in new implementations
and should just be ignored if they are not explicitely handled.

BUG:342249
FIXED-IN:14.12.1
---

diff --git a/kgpg/transactions/kgpgimport.cpp b/kgpg/transactions/kgpgimport.cpp
index e1203e4..9bf6c72 100644 (file)
--- a/kgpg/transactions/kgpgimport.cpp
+++ b/kgpg/transactions/kgpgimport.cpp
@@ -116,7 +116,7 @@ KGpgImport::getImportMessage(const QStringList &log)
 
                const QStringList rstr(str.mid(20).simplified().split(QLatin1Char( ' ' )));
 
-               fine = (rstr.count() == RESULT_PARTS);
+               fine = (rstr.count() >= RESULT_PARTS);
 
                i = 0;
                while (fine && (i < RESULT_PARTS)) {