From b73120ba3084fb66167ac70ec3632b74353c08ca Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 13 Jan 2014 00:34:15 +0100
Subject: [PATCH] fatal error if no sliver_xxx module can be imported (i.e.
 neither lxc nor vs) - for devel

---
 slivermanager.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/slivermanager.py b/slivermanager.py
index 287ee07..624853e 100644
--- 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:
-    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
-- 
2.43.0