From: david-sarah Date: Fri, 14 Sep 2012 02:14:48 +0000 (+0000) Subject: src/allmydata/__init__.py: ensure that if a dependency cannot be imported, we will... X-Git-Tag: allmydata-tahoe-1.10a1~55 X-Git-Url: https://git.rkrishnan.org/pf/content/%22news.html/%22doc.html/provisioning?a=commitdiff_plain;h=36c176224d1ebacf2036cb66c12010d7615c7970;p=tahoe-lafs%2Ftahoe-lafs.git src/allmydata/__init__.py: ensure that if a dependency cannot be imported, we will report that rather than reporting a confusing message about the version and location being None. fixes #1804 --- diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py index 7c523633..ff9a8fbf 100644 --- a/src/allmydata/__init__.py +++ b/src/allmydata/__init__.py @@ -291,6 +291,12 @@ def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list): continue pr_ver, pr_loc = pkg_resources_vers_and_locs[name] + if imp_ver is None and imp_loc is None: + errors.append("Warning: dependency %r could not be imported. pkg_resources thought it should be possible " + "to import version %r from %r.\nThe exception trace was %r." + % (name, pr_ver, pr_loc, imp_comment)) + continue + try: pr_normver = normalized_version(pr_ver) except Exception, e: