From 3311c79618b243c1a709c428688f6af5e306c774 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 18 Jul 2012 16:21:45 +0200 Subject: [PATCH] bugfix - needed by the PL importer when a person has a non-ssh key (like gpg) --- sfa/importer/plimporter.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py index 1e04e54c..16733fa0 100644 --- a/sfa/importer/plimporter.py +++ b/sfa/importer/plimporter.py @@ -167,9 +167,13 @@ class PlImporter: for person in persons: pubkeys = [] for key_id in person['key_ids']: - key = keys_by_id[key_id] - if key['key_type'] == 'ssh': + # by construction all the keys we fetched are ssh keys + # so gpg keys won't be in there + try: + key = keys_by_id[key_id] pubkeys.append(key) + except: + self.logger.warning("Could not spot key %d - probably non-ssh"%key_id) keys_by_person_id[person['person_id']] = pubkeys # Get all plc nodes nodes = shell.GetNodes( {'peer_id': None}, ['node_id', 'hostname', 'site_id']) -- 2.43.0