From: root <root@devel.pl.sophia.inria.fr>
Date: Wed, 18 Jul 2012 14:22:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'local_master/master'
X-Git-Tag: sfa-2.1-14~96^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=67e01f3db0ff9ede48bcf8463af4afeb14b81312;hp=5672d5f4d79054e274005b0dbe930bd348e6cf47;p=sfa.git

Merge remote-tracking branch 'local_master/master'
---

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'])