Minor code cleanup in __init__.py.

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / __init__.py

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 5f6cd8c11f2f948d77bde72539125ca26a29c5dc..5262773ae3a419d016a4243f85ca03f3a6a249aa 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -377,12 +377,12 @@ def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list):
                                               % (name, pr_ver, str(pr_normver), pr_loc, imp_ver, str(imp_normver), imp_loc))
 
     imported_packages = set([p.lower() for (p, _) in imported_vers_and_locs_list])
+    extra_vers_and_locs_list = []
     for pr_name, (pr_ver, pr_loc) in pkg_resources_vers_and_locs.iteritems():
         if pr_name not in imported_packages and pr_name not in ignorable:
-            errors.append("Warning: dependency %r (version %r) found by pkg_resources not found by import."
-                          % (pr_name, pr_ver))
+            extra_vers_and_locs_list.append( (pr_name, (pr_ver, pr_loc, "according to pkg_resources")) )
 
-    return errors
+    return errors, extra_vers_and_locs_list
 
 
 def get_error_string(errors, debug=False):
@@ -437,6 +437,12 @@ def get_package_locations():
     return dict([(k, l) for k, (v, l, c) in _vers_and_locs_list])
 
 def get_package_versions_string(show_paths=False, debug=False):
+    errors = []
+    if not hasattr(sys, 'frozen'):
+        global _vers_and_locs_list
+        errors, extra_vers_and_locs_list = cross_check_pkg_resources_versus_import()
+        _vers_and_locs_list += extra_vers_and_locs_list
+
     res = []
     for p, (v, loc, comment) in _vers_and_locs_list:
         info = str(p) + ": " + str(v)
@@ -448,9 +454,7 @@ def get_package_versions_string(show_paths=False, debug=False):
 
     output = "\n".join(res) + "\n"
 
-    if not hasattr(sys, 'frozen'):
-        errors = cross_check_pkg_resources_versus_import()
-        if errors:
-            output += get_error_string(errors, debug=debug)
+    if errors:
+        output += get_error_string(errors, debug=debug)
 
     return output