From d1618de5ce6d251957494931d62ef19e21edabee Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 6 Jul 2011 14:12:46 -0400
Subject: [PATCH] catch eception if convert_publickey fails
---
sfa/plc/sfaImport.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index cce4efe4..e9d0940e 100644
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -135,7 +135,11 @@ class sfaImport:
# to planetlab
keys = self.shell.GetKeys(self.plc_auth, key_ids)
key = keys[0]['key']
- pkey = convert_public_key(key)
+ pkey = None
+ try:
+ pkey = convert_public_key(key)
+ except:
+ self.logger.warn('unable to convert public key for %s' % hrn)
if not pkey:
pkey = Keypair(create=True)
else:
--
2.47.0