From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 18:16:13 +0000 (+0100)
Subject: Mon Aug  8 19:20:13 BST 2011  david-sarah@jacaranda.org
X-Git-Url: https://git.rkrishnan.org/vdrive/listings/sub?a=commitdiff_plain;h=4ae88513cd6b4d2ae4e6fa17782dd9ded5db48c1;p=tahoe-lafs%2Ftahoe-lafs.git

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 4b70273e..af28b113 100644
--- 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()