fatal error if no sliver_xxx module can be imported (i.e. neither lxc nor vs) - for...

diff --git a/slivermanager.py b/slivermanager.py
index 287ee07..624853e 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -23,11 +23,15 @@ try:
     sliver_class_to_register = sliver_lxc.Sliver_LXC
     sliver_password_shell = sliver_lxc.Sliver_LXC.SHELL
 except:
     sliver_class_to_register = sliver_lxc.Sliver_LXC
     sliver_password_shell = sliver_lxc.Sliver_LXC.SHELL
 except:

-    import sliver_vs
-    implementation='vs'
-    sliver_default_type='sliver.VServer'
-    sliver_class_to_register = sliver_vs.Sliver_VS
-    sliver_password_shell = sliver_vs.Sliver_VS.SHELL
+    try:
+        import sliver_vs
+        implementation='vs'
+        sliver_default_type='sliver.VServer'
+        sliver_class_to_register = sliver_vs.Sliver_VS
+        sliver_password_shell = sliver_vs.Sliver_VS.SHELL
+    except:
+        logger.log("Could not import either sliver_lxc or sliver_vs - bailing out")
+        exit(1)

 
 # just being safe
 try : from plnode.bwlimit import bwmin, bwmax
 
 # just being safe
 try : from plnode.bwlimit import bwmin, bwmax