Fix coil dependency check and documentation

mythmon · Aug 1, 2011 · f61c653 · f61c653
1 parent 6840986
commit f61c653
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/README b/README
@@ -50,17 +50,17 @@ REQUIREMENTS
 Strict requirements:
 
 - Python >= 2.4 (>= 2.5 recommended)
-- Twisted >= 2.5 (>= 8.2 recommended)
-- Coil >= 0.3.5
+- Twisted >= 8.2
+- Coil 0.3.x >= 0.3.14
   http://code.google.com/p/coil
 
 Optional:
 
 - PyOpenSSL (for HTTPS support)
+- netsnmp (for SNMP support)
 - lxml (for XPath filter support)
 - rrdtool (for graphing)
-- pynetsnmp (for SNMP querys)
-  http://svn.zenoss.org/svn/trunk/pynetsnmp/
+- cx_Oracle
 
 
 

diff --git a/python/nagcat/__init__.py b/python/nagcat/__init__.py
@@ -19,8 +19,9 @@
 import coil
 
 # Make sure we have the right coil version
-if getattr(coil, '__version_info__', (0,0)) < (0,3,14):
-    raise ImportError("coil >= 0.3.14 is required")
+_coil_version = getattr(coil, '__version_info__', (0,0))
+if _coil_version < (0,3,14) or _coil_version <= (0,3,99):
+    raise ImportError("coil 0.3.x >= 0.3.14 is required")
 
 # Require Twisted >= 8.2, older versions had problematic bugs
 if twisted.version < versions.Version('twisted', 8, 2, 0):