[Erp5-report] r41651 aurel - /erp5/trunk/products/Vifib/Tool/SlapTool.py

[nobody at svn.erp5.org]

Author: aurel
Date: Wed Dec 22 11:45:47 2010
New Revision: 41651

URL: http://svn.erp5.org?rev=41651&view=rev
Log:
do not prevent instance from starting if slapos libs are not installed

Modified:
    erp5/trunk/products/Vifib/Tool/SlapTool.py

Modified: erp5/trunk/products/Vifib/Tool/SlapTool.py
URL: http://svn.erp5.org/erp5/trunk/products/Vifib/Tool/SlapTool.py?rev=41651&r1=41650&r2=41651&view=diff
==============================================================================
--- erp5/trunk/products/Vifib/Tool/SlapTool.py [utf8] (original)
+++ erp5/trunk/products/Vifib/Tool/SlapTool.py [utf8] Wed Dec 22 11:45:47 2010
@@ -38,10 +38,27 @@ from Products.ERP5Type.Globals import In
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 from lxml import etree
-from slapos.slap.slap import Computer
-from slapos.slap.slap import ComputerPartition as SlapComputerPartition
-from slapos.slap.slap import SoftwareInstance
-from slapos.slap.slap import SoftwareRelease
+try:
+  from slapos.slap.slap import Computer
+  from slapos.slap.slap import ComputerPartition as SlapComputerPartition
+  from slapos.slap.slap import SoftwareInstance
+  from slapos.slap.slap import SoftwareRelease
+except ImportError:
+  # Do no prevent instance from starting
+  # if libs are not installed
+  class Computer:
+    def __init__(self):
+      raise ImportError
+  class SlapComputerPartition:
+    def __init__(self):
+      raise ImportError
+  class SoftwareInstance:
+    def __init__(self):
+      raise ImportError
+  class SoftwareRelease:
+    def __init__(self):
+      raise ImportError
+
 from zLOG import LOG, INFO
 import xml_marshaller