Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-keys:gsoc-2016 commit in: gkeys/gkeys/
Date: Sat, 24 Dec 2016 09:13:50
Message-Id: 1482539815.93c87f84c607819b8b544705f2b50d6721911bd3.dolsen@gentoo
1 commit: 93c87f84c607819b8b544705f2b50d6721911bd3
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 24 00:36:55 2016 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 24 00:36:55 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=93c87f84
7
8 gkeys actionbase: Fix trust model detection & setting in _set_trust()
9
10 gkeys/gkeys/actionbase.py | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py
14 index 67d3520..3993be4 100644
15 --- a/gkeys/gkeys/actionbase.py
16 +++ b/gkeys/gkeys/actionbase.py
17 @@ -95,8 +95,8 @@ class ActionBase(object):
18 trust = self.config.get_key('trust-model', cat)
19 if trust in [None]:
20 trust = 'auto'
21 - if 'trust-model' in self.config.defaults['gpg_defaults']:
22 - index = self.config.defaults['gpg_defaults'].index('trust-model')
23 + if '--trust-model' in self.config.defaults['gpg_defaults']:
24 + index = self.config.defaults['gpg_defaults'].index('--trust-model')
25 self.config.defaults['gpg_defaults'][index+1] = trust
26 else:
27 self.config.defaults['gpg_defaults'].extend(['--trust-model', trust])