From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3515C138CD0 for ; Sun, 31 May 2015 05:03:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19379E0903; Sun, 31 May 2015 05:03:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A728E08DC for ; Sun, 31 May 2015 05:03:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84AE8340CBB for ; Sun, 31 May 2015 05:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6E45A2F for ; Sun, 31 May 2015 05:03:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1433028737.695631f23ad2bddff1f3efda698a90a23d38db1c.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/seedhandler.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 695631f23ad2bddff1f3efda698a90a23d38db1c X-VCS-Branch: master Date: Sun, 31 May 2015 05:03:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27ad83d3-4c45-40bc-bf7d-c8714706c9ee X-Archives-Hash: dfd6b6a74bdfdf9eec23e9a91124e613 commit: 695631f23ad2bddff1f3efda698a90a23d38db1c Author: Brian Dolbec gentoo org> AuthorDate: Mon Apr 20 17:46:59 2015 +0000 Commit: Brian Dolbec gentoo 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