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 2DA7C138CCA for ; Tue, 24 Mar 2015 03:13:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87FD9E08F4; Tue, 24 Mar 2015 03:13:26 +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 35AEAE08F4 for ; Tue, 24 Mar 2015 03:13:26 +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 DECF8340A3A for ; Tue, 24 Mar 2015 03:13:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F70114429 for ; Tue, 24 Mar 2015 03:13:21 +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: <1427166770.f236426ca3977317586278b399406529f3975825.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/gkeyldap/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys-ldap/gkeyldap/actions.py X-VCS-Directories: gkeys-ldap/gkeyldap/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f236426ca3977317586278b399406529f3975825 X-VCS-Branch: master Date: Tue, 24 Mar 2015 03:13:21 +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: cae1e0b1-e459-42cf-9199-2dc5b9e99274 X-Archives-Hash: ac8ec2d4a38d5d0c06f7d011da32d336 commit: f236426ca3977317586278b399406529f3975825 Author: Brian Dolbec gentoo org> AuthorDate: Tue Mar 24 03:12:50 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Mar 24 03:12:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=f236426c gkeyldap/actions.py: Ignore 'undefined' for the keyid,longkeyid fields. Interim change until the keyid's and longkeyid's are dropped from LDAP. gkeys-ldap/gkeyldap/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gkeys-ldap/gkeyldap/actions.py b/gkeys-ldap/gkeyldap/actions.py index 7e951e0..9558ed0 100644 --- a/gkeys-ldap/gkeyldap/actions.py +++ b/gkeys-ldap/gkeyldap/actions.py @@ -206,7 +206,7 @@ class Actions(object): keyid_found = True elif values and attr in ['fingerprint']: values = [v.replace(' ', '') for v in values] - if 'undefined' in values: + if 'undefined' in values and attr not in ['keyid', 'longkeyid']: self.logger.error('ERROR in LDAP info for: %s, %s' % (info['uid'][0], info['cn'][0])) self.logger.error(' %s = "undefined"' % (field))