From: zooko <zooko@zooko.com>
Date: Wed, 17 Jun 2009 18:20:39 +0000 (+0530)
Subject: misc/show-tool-versions.py: show setuptools version
X-Git-Url: https://git.rkrishnan.org/?p=tahoe-lafs%2Fzfec.git;a=commitdiff_plain;h=470bda53cb6565ed56beee6aaf92b125aa6e25c3

misc/show-tool-versions.py: show setuptools version

Ignore-this: b0ae5935f2642954f013d7087c16e1f6

darcs-hash:f222f4adc0e4b9589a937cffe054ff55c62423ce
---

diff --git a/misc/show-tool-versions.py b/misc/show-tool-versions.py
index 13e7263..820eb01 100755
--- a/misc/show-tool-versions.py
+++ b/misc/show-tool-versions.py
@@ -9,7 +9,7 @@ try:
     out = subprocess.Popen(["buildbot", "--version"],
                            stdout=subprocess.PIPE).communicate()[0]
     print "buildbot:", out.replace("\n", " ")
-except OSError:
+except EnvironmentError:
     pass
 
 try:
@@ -20,7 +20,7 @@ try:
     print
     print "darcs:", out.replace("\n", " ")
     print full.rstrip()
-except OSError:
+except EnvironmentError:
     pass
 
 try:
@@ -28,6 +28,13 @@ try:
     out = platform.platform()
     print
     print "platform:", out.replace("\n", " ")
-    print full.rstrip()
-except OSError:
+except EnvironmentError:
+    pass
+
+try:
+    import pkg_resources
+    out = str(pkg_resources.require("setuptools"))
+    print
+    print "setuptools:", out.replace("\n", " ")
+except EnvironmentError:
     pass