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 78e157d5203980b8eb68f0c13bd8d7ac03510a00..694b6e6c55abc17751b18905a7ff883af8165461 100644 (file)
--- 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 8a27fdeb733d3c16dd3fe94b43880844ef4dfe25..63bf7576ddcec909e9cc01f7782037f81b7648a0 100644 (file)
--- 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():