1 |
commit: 6d02096f1b8afbf3ed2126def65cfbe2d65d0237 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 28 08:24:22 2014 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 30 21:42:26 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=6d02096f |
7 |
|
8 |
gkeys/gkey.py: Separate uid string printing for list type output |
9 |
|
10 |
--- |
11 |
gkeys/gkeys/gkey.py | 8 ++++++-- |
12 |
1 file changed, 6 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/gkeys/gkeys/gkey.py b/gkeys/gkeys/gkey.py |
15 |
index 463f007..130a5d5 100644 |
16 |
--- a/gkeys/gkeys/gkey.py |
17 |
+++ b/gkeys/gkeys/gkey.py |
18 |
@@ -18,7 +18,10 @@ GKEY_STRING = ''' ---------- |
19 |
Name.........: %(name)s |
20 |
Nick.........: %(nick)s |
21 |
Keydir.......: %(keydir)s |
22 |
- UID..........: %(uid)s |
23 |
+''' |
24 |
+ |
25 |
+GKEY_UID = \ |
26 |
+''' UID..........: %(uid)s |
27 |
''' |
28 |
|
29 |
GKEY_FINGERPRINTS = \ |
30 |
@@ -48,9 +51,10 @@ class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'keys', 'fingerprint', |
31 |
'name': self.name, |
32 |
'nick': self.nick, |
33 |
'keydir': self.keydir, |
34 |
- 'uid': self.uid, |
35 |
} |
36 |
output = GKEY_STRING % gkey |
37 |
+ for uid in self.uid: |
38 |
+ output += GKEY_UID % {'uid': uid} |
39 |
for f in self.fingerprint: |
40 |
fingerprint = {'fingerprint': f, 'keyid': '0x' + f[-16:]} |
41 |
output += GKEY_FINGERPRINTS % fingerprint |