From: Daira Hopwood <david-sarah@jacaranda.org>
Date: Thu, 18 Apr 2013 21:43:41 +0000 (+0100)
Subject: Fix version check warnings for httplib2 and python-gflags (used by oauth2client).
X-Git-Url: https://git.rkrishnan.org/uri/URI:DIR2:%5B%5E?a=commitdiff_plain;h=1b70eb448fac4efdf88d92674cb63b10721214ed;p=tahoe-lafs%2Ftahoe-lafs.git

Fix version check warnings for httplib2 and python-gflags (used by oauth2client).

Signed-off-by: Daira Hopwood <david-sarah@jacaranda.org>
---

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 78e157d5..694b6e6c 100644
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -282,7 +282,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'])
+    not_import_versionable = set(['zope.interface', 'mock', 'pyasn1', 'python-gflags'])
     ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core', 'twisted-conch', 'six'])
 
     for name, (imp_ver, imp_loc, imp_comment) in imported_vers_and_locs_list:
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 8a27fdeb..63bf7576 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -95,6 +95,8 @@ package_imports = [
     ('txAWS',           'txaws'),
     ('oauth2client',    'oauth2client'),
     ('python-dateutil', 'dateutil'),
+    ('httplib2',        'httplib2'),
+    ('python-gflags',   'gflags'),
 ]
 
 def require_more():