Mon Aug 8 19:20:13 BST 2011 david-sarah@jacaranda.org

  * src/allmydata/__init__.py: head off a possible warning on platforms where twisted-conch is a separate package.

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 4b70273ecaa3d8325e00a6736b6911f1ebf40dac..af28b113c3b245fc97ef9ae2e432c296fe9e1a36 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -275,7 +275,7 @@ def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list):
     errors = []
     not_pkg_resourceable = set(['sqlite3', 'python', 'platform', __appname__.lower()])
     not_import_versionable = set(['zope.interface', 'mock', 'pyasn1'])
-    ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core'])
+    ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core', 'twisted-conch'])
 
     for name, (imp_ver, imp_loc, imp_comment) in imported_vers_and_locs_list:
         name = name.lower()