From: david-sarah <david-sarah@jacaranda.org>
Date: Mon, 8 Aug 2011 18:20:13 +0000 (+0000)
Subject: src/allmydata/__init__.py: head off a possible warning on platforms where twisted... 
X-Git-Tag: allmydata-tahoe-1.10a1~74
X-Git-Url: https://git.rkrishnan.org/uri/URI:DIR2:%5B%5E?a=commitdiff_plain;h=37ee8f79d5208db51fc0a58eb3e402ef8e17ffe3;p=tahoe-lafs%2Ftahoe-lafs.git

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 867dc0ea..7c523633 100644
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -271,7 +271,7 @@ def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list):
     errors = []
     not_pkg_resourceable = set(['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()