From: zooko <zooko@zooko.com>
Date: Mon, 10 May 2010 05:03:29 +0000 (+0530)
Subject: setup: don't exit with an error code from show-tool-versions.py when coverage or... 
X-Git-Url: https://git.rkrishnan.org/webform_css?a=commitdiff_plain;h=221f9a4d15bbaf26583fabd126e9297d0a7f1b69;p=tahoe-lafs%2Fzfec.git

setup: don't exit with an error code from show-tool-versions.py when coverage or trialcoverage are not found

Ignore-this: a54fe128520ff837a9bb70362dd55d8f

darcs-hash:a079846759ce65c484e8d8b92a853d90f798e4eb
---

diff --git a/misc/show-tool-versions.py b/misc/show-tool-versions.py
index 73582d9..ffe9aa0 100755
--- a/misc/show-tool-versions.py
+++ b/misc/show-tool-versions.py
@@ -66,6 +66,9 @@ try:
 except (ImportError, EnvironmentError), le:
     sys.stderr.write("Got exception using 'pkg_resources' to get the version of coverage: %s" % (le,))
     pass
+except pkg_resources.DistributionNotFound, le:
+    sys.stderr.write("pkg_resources reported no coverage package installed: %s" % (le,))
+    pass
 
 try:
     import pkg_resources
@@ -75,3 +78,6 @@ try:
 except (ImportError, EnvironmentError), le:
     sys.stderr.write("Got exception using 'pkg_resources' to get the version of trialcoverage: %s" % (le,))
     pass
+except pkg_resources.DistributionNotFound, le:
+    sys.stderr.write("pkg_resources reported no trialcoverage package installed: %s" % (le,))
+    pass