Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager

diff --git a/NodeManager.spec b/NodeManager.spec
index 20548d8..1106bc4 100644 (file)
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -2,7 +2,7 @@
 
 %define name NodeManager
 %define version 2.0
-%define taglevel 24
+%define taglevel 25
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/lib/
 
 %changelog
+* Tue Jan 04 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-2.0-25
+- Catch all exceptions for sfa plugin
+
 * Wed Dec 22 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-2.0-24
 - Handle exception AttributeError: ComponentAPI instance has no attribute 'get_registry'
 

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 5c2394b..88e2341 100644 (file)
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -34,7 +34,7 @@ def start():
         keyfile, certfile = get_keypair(None)
         api = ComponentAPI(key_file=keyfile, cert_file=certfile)
         api.get_node_key()
-    except AttributeError:
+    except:
         return
 
 def GetSlivers(data, config=None, plc=None):