diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-01-03 19:29:52 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-01-05 14:14:36 -0800 |
| commit | 1e10ed38ab63229a1dabb7d77ec386977e3a1ce5 (patch) | |
| tree | 551347eb4e66d84168ba4a329f6b696935fdf084 /gkeys-ldap | |
| parent | gkeys/actions.py: Remove import-key from Available_actions (diff) | |
| download | gentoo-keys-1e10ed38ab63229a1dabb7d77ec386977e3a1ce5.tar.gz gentoo-keys-1e10ed38ab63229a1dabb7d77ec386977e3a1ce5.tar.bz2 gentoo-keys-1e10ed38ab63229a1dabb7d77ec386977e3a1ce5.zip | |
gkeys: Add pub_keyid property to GKEY
Actions like spec-check used keyid property which resulted in double processing and output since now all subkey fingerprints are in the fingerprint field.
Add keys field to remaining places for seedhandling
Fix add_key for the new GKEY.keys field
Add cross saving fingerprints to the new keys field
Diffstat (limited to 'gkeys-ldap')
| -rw-r--r-- | gkeys-ldap/gkeyldap/actions.py | 1 | ||||
| -rw-r--r-- | gkeys-ldap/gkeyldap/search.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/gkeys-ldap/gkeyldap/actions.py b/gkeys-ldap/gkeyldap/actions.py index 1c499aa..45fff09 100644 --- a/gkeys-ldap/gkeyldap/actions.py +++ b/gkeys-ldap/gkeyldap/actions.py @@ -181,6 +181,7 @@ class Actions(object): # drop keyid and longkeyid keyinfo.pop('keyid', None) keyinfo.pop('longkeyid', None) + keyinfo['keys'] = keyinfo['fingerprint'] return keyinfo return None diff --git a/gkeys-ldap/gkeyldap/search.py b/gkeys-ldap/gkeyldap/search.py index 1bce9e1..c13527f 100644 --- a/gkeys-ldap/gkeyldap/search.py +++ b/gkeys-ldap/gkeyldap/search.py @@ -64,5 +64,7 @@ class LdapSearch(object): for entry in results: info = entry[1] key_value = info[key][0] + if key_value in ['fingerprint']: + _dict['keys'] = info _dict[key_value] = info return _dict |