1 |
commit: c1cf82a2f2f651da4749065be050154f23e07469 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 24 04:51:55 2016 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 24 04:51:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c1cf82a2 |
7 |
|
8 |
gkeys actions: Migrate self.category setting to _set_category() |
9 |
|
10 |
gkeys/gkeys/actions.py | 18 ++++++++++-------- |
11 |
1 file changed, 10 insertions(+), 8 deletions(-) |
12 |
|
13 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
14 |
index 07dba7a..a9d2b69 100644 |
15 |
--- a/gkeys/gkeys/actions.py |
16 |
+++ b/gkeys/gkeys/actions.py |
17 |
@@ -108,6 +108,7 @@ class Actions(ActionBase): |
18 |
if args.uid is None: |
19 |
args.uid = [] |
20 |
gkey = self.seedhandler.new(args, checkgkey=True) |
21 |
+ self._set_category(args.category) |
22 |
if not gkey: |
23 |
return (False, ["Failed to create a valid GKEY instance.", |
24 |
"Check for invalid data entries"]) |
25 |
@@ -198,7 +199,7 @@ class Actions(ActionBase): |
26 |
# fill in code here |
27 |
if not args.category: |
28 |
args.category = 'gentoo' |
29 |
- self.category = args.category |
30 |
+ self._set_category(args.category) |
31 |
if args.keydir: |
32 |
self.gpg.set_keydir(args.keydir, "list-keys") |
33 |
self.gpg.set_keyseedfile() |
34 |
@@ -267,7 +268,7 @@ class Actions(ActionBase): |
35 |
return (False, ["Search failed for search term"]) |
36 |
# get confirmation |
37 |
# fill in code here |
38 |
- self.category = args.category |
39 |
+ self._set_category(args.category) |
40 |
for gkey in gkeys: |
41 |
self.gpg.set_keydir(gkey.keydir, "recv-keys") |
42 |
self.gpg.set_keyseedfile() |
43 |
@@ -325,7 +326,7 @@ class Actions(ActionBase): |
44 |
return (False, [_unicode("Please specify seeds category.")]) |
45 |
self.logger.debug(_unicode("ACTIONS: checkkey; args: %s") % _unicode(args)) |
46 |
seeds = self.seedhandler.load_category(args.category) |
47 |
- self.category = args.category |
48 |
+ self._set_category(args.category) |
49 |
results = {} |
50 |
failed = defaultdict(list) |
51 |
kwargs = self.seedhandler.build_gkeydict(args) |
52 |
@@ -375,7 +376,7 @@ class Actions(ActionBase): |
53 |
return (False, ["Please specify seeds category."]) |
54 |
self.logger.debug(_unicode("ACTIONS: speccheck; args: %s") |
55 |
% _unicode(args)) |
56 |
- self.category = args.category |
57 |
+ self._set_category(args.category) |
58 |
catdir, keyresults = self.keyhandler.determine_keys(args) |
59 |
self.logger.debug(_unicode("ACTIONS: speccheck; catdir = %s") % catdir) |
60 |
results = {} |
61 |
@@ -524,6 +525,7 @@ class Actions(ActionBase): |
62 |
self.logger.debug(_unicode("ACTIONS: removekey; kwargs: %s") |
63 |
% _unicode(kwargs)) |
64 |
seeds = self.seedhandler.load_category(args.category) |
65 |
+ self._set_category(args.category) |
66 |
messages = [] |
67 |
if args.nick == '*': |
68 |
self.output([''],_unicode('Remove All keys in category: %s') |
69 |
@@ -620,9 +622,9 @@ class Actions(ActionBase): |
70 |
'''Lists the installed key directories''' |
71 |
if args.category: |
72 |
keyring = self.config.get_key('keyring') |
73 |
- catdir = os.path.join(keyring, args.category) |
74 |
else: |
75 |
return (False, ["Please specify a category."]) |
76 |
+ catdir = self._set_category(args.category) |
77 |
self.logger.debug("ACTIONS: installed; catdir = %s" % catdir) |
78 |
installed_keys = [] |
79 |
try: |
80 |
@@ -697,7 +699,7 @@ class Actions(ActionBase): |
81 |
def _verify(self, args, key, messages=None): |
82 |
if messages == None: |
83 |
messages = [] |
84 |
- self.category = args.category |
85 |
+ self._set_category(args.category) |
86 |
filepath, signature = args.filename, args.signature |
87 |
timestamp_path = None |
88 |
isurl = success = verified = False |
89 |
@@ -831,9 +833,9 @@ class Actions(ActionBase): |
90 |
else: |
91 |
nicks = args.nick |
92 |
args.category = 'sign' |
93 |
+ self._set_category(args.category) |
94 |
# load our installed signing keys db |
95 |
self.seeds = self.seedhandler.load_category('sign', nicks) |
96 |
- self.category = args.category |
97 |
if not self.seeds.seeds: |
98 |
return (False, ['No installed keys, try installkey action.', '']) |
99 |
keydir = self.config.get_key("sign", "keydir") |
100 |
@@ -877,7 +879,7 @@ class Actions(ActionBase): |
101 |
self.logger.debug(_unicode("ACTIONS: refreshkey; args: %s") |
102 |
% _unicode(args)) |
103 |
seeds = self.seedhandler.load_category(args.category, refresh=True) |
104 |
- self.category = args.category |
105 |
+ self._set_category(args.category) |
106 |
results = {} |
107 |
kwargs = self.seedhandler.build_gkeydict(args) |
108 |
keyresults = seeds.list(**kwargs) |