From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 309FF138334 for ; Sat, 7 Jul 2018 15:10:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0716FE0ACE; Sat, 7 Jul 2018 15:10:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C70A1E0ACE for ; Sat, 7 Jul 2018 15:10:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3F20335C63 for ; Sat, 7 Jul 2018 15:10:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2DEC354 for ; Sat, 7 Jul 2018 15:10:25 +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: <1530974866.dd966401553f4632f60cb673327b9446fb326654.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/base.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: dd966401553f4632f60cb673327b9446fb326654 X-VCS-Branch: master Date: Sat, 7 Jul 2018 15:10:25 +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: 1f1b6286-3d0e-488f-b4f8-139d7cdac9a7 X-Archives-Hash: c4f09a9b84470c9e31c4d9e3180bce4d commit: dd966401553f4632f60cb673327b9446fb326654 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 7 14:47:46 2018 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Jul 7 14:47:46 2018 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=dd966401 gkeys/base.py: Fix args.email test for gkeys-ldap gkeys-ldap does not use the email arg. Prevents: File "/var/lib/gkeys/gentoo-keys/gkeys/gkeys/base.py", line 330, in setup if args.email: AttributeError: 'Namespace' object has no attribute 'email' Signed-off-by: Brian Dolbec gentoo.org> gkeys/gkeys/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py index 8aff933..48c8a4d 100644 --- a/gkeys/gkeys/base.py +++ b/gkeys/gkeys/base.py @@ -327,7 +327,7 @@ class CliBase(object): if args.config: self.config.defaults['config'] = args.config self.config.defaults['configdir'] = os.path.dirname(args.config) - if args.email: + if getattr(args, 'email', False): configs = [self.config.defaults['config'], os.path.abspath(os.path.join(self.config.defaults['configdir'], "email.conf"))] self.config.read_config(configs) else: