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 ABE56139085 for ; Sat, 24 Dec 2016 00:38:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAA28E0B91; Sat, 24 Dec 2016 00:38:29 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B767CE0B91 for ; Sat, 24 Dec 2016 00:38: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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55898341142 for ; Sat, 24 Dec 2016 00:38:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C186324E5 for ; Sat, 24 Dec 2016 00:38:26 +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: <1482539815.93c87f84c607819b8b544705f2b50d6721911bd3.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: 93c87f84c607819b8b544705f2b50d6721911bd3 X-VCS-Branch: master Date: Sat, 24 Dec 2016 00:38:26 +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: 6483246b-4e9e-4e3e-9913-898a64175f99 X-Archives-Hash: a78821def553fed51ab9196a44ece499 Message-ID: <20161224003826.4y9hMwDjK-8P3aoAZdkbDlfgJEvkvcv3U183brKFj5E@z> commit: 93c87f84c607819b8b544705f2b50d6721911bd3 Author: Brian Dolbec gentoo org> AuthorDate: Sat Dec 24 00:36:55 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Dec 24 00:36:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=93c87f84 gkeys actionbase: Fix trust model detection & setting in _set_trust() gkeys/gkeys/actionbase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py index 67d3520..3993be4 100644 --- a/gkeys/gkeys/actionbase.py +++ b/gkeys/gkeys/actionbase.py @@ -95,8 +95,8 @@ class ActionBase(object): trust = self.config.get_key('trust-model', cat) if trust in [None]: trust = 'auto' - if 'trust-model' in self.config.defaults['gpg_defaults']: - index = self.config.defaults['gpg_defaults'].index('trust-model') + if '--trust-model' in self.config.defaults['gpg_defaults']: + index = self.config.defaults['gpg_defaults'].index('--trust-model') self.config.defaults['gpg_defaults'][index+1] = trust else: self.config.defaults['gpg_defaults'].extend(['--trust-model', trust])