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 189CA138334 for ; Sat, 7 Jul 2018 05:24:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 423BDE0B67; Sat, 7 Jul 2018 05:23:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0AD65E0B66 for ; Sat, 7 Jul 2018 05:23:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DF4B9335C9E for ; Sat, 7 Jul 2018 05:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB75136A for ; Sat, 7 Jul 2018 05:23:50 +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: <1530940932.c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/actionbase.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba X-VCS-Branch: master Date: Sat, 7 Jul 2018 05:23:50 +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: 59711318-ed41-4298-86e8-a97bdd1b679d X-Archives-Hash: f42b2e99e5ce6b6e9af25ab3ecbd7a44 commit: c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba Author: Brian Dolbec gentoo org> AuthorDate: Thu Jul 5 15:25:13 2018 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Jul 7 05:22:12 2018 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c63848f5 gkeys actionbase.py: Update _set_category for the new keyrings config All keyings locations can be set individually now Signed-off-by: Brian Dolbec gentoo.org> gkeys/gkeys/actionbase.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py index 23b7161..737c9d6 100644 --- a/gkeys/gkeys/actionbase.py +++ b/gkeys/gkeys/actionbase.py @@ -80,13 +80,12 @@ class ActionBase(object): def _set_category(self, cat): - keyring = self.config.get_key('keyring') - if not keyring: + catdir = self.config.get_key('keyrings', cat) + if not catdir: raise Exception("No keyring set.") if not cat: raise Exception("No category set.") self.category = cat - catdir = os.path.join(keyring, cat) self.logger.debug(_unicode("ACTIONS: _set_category; catdir = %s") % catdir) self._set_trust(cat) return catdir