[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

[Brian Dolbec]

commit:     695631f23ad2bddff1f3efda698a90a23d38db1c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 17:46:59 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May 30 23:32:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=695631f2

gkeys/seedhandler.py: Fix build_gkeydict()

 gkeys/gkeys/seedhandler.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
index 86cab25..18725b9 100644
--- a/gkeys/gkeys/seedhandler.py
+++ b/gkeys/gkeys/seedhandler.py
@@ -58,10 +58,13 @@ class SeedHandler(object):
                 value = getattr(args, attr)
                 if attr == 'name' and isinstance(value, list):
                     value = " ".join(value)
-                if attr == 'fingerprint' and value:
+                if attr in ['fingerprint', 'keys'] and value:
                     value = [x.replace(" ", "") for x in value]
-                if value is not None:
+                    keyinfo[attr] = value
+                if value is not None and attr in ['keydir', 'name', 'nick']:
                     keyinfo[attr] = decoder(value)
+                else:
+                    keyinfo[attr] = value
             except AttributeError:
                 pass
         return keyinfo