From: zooko <zooko@zooko.com>
Date: Mon, 20 Sep 2010 22:52:13 +0000 (+0530)
Subject: setup: make show-tool-versions format its output in a more human-readable way
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=348cef42a8be4de23f51c9bbd9f8aedd350963f7;p=tahoe-lafs%2Fzfec.git

setup: make show-tool-versions format its output in a more human-readable way

Ignore-this: b83372b8535998534e0e641e98bd7836

darcs-hash:a4b89b3434af1f917850ea26888d9a1e741c079d
---

diff --git a/misc/build_helpers/show-tool-versions.py b/misc/build_helpers/show-tool-versions.py
index 98740d1..d88e78f 100755
--- a/misc/build_helpers/show-tool-versions.py
+++ b/misc/build_helpers/show-tool-versions.py
@@ -2,7 +2,11 @@
 
 import os, subprocess, sys, traceback
 
+def foldlines(s):
+    return s.replace("\n", " ").replace("\r", "")
+
 def print_platform():
+    print
     try:
         import platform
         out = platform.platform()
@@ -11,76 +15,84 @@ def print_platform():
     except EnvironmentError:
         sys.stderr.write("Got exception using 'platform'. Exception follows\n")
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 def print_python_ver():
-    print "python:", sys.version.replace("\n", " ") + ', maxunicode: ' + str(sys.maxunicode)
+    print
+    print "python:", foldlines(sys.version)
+    print 'maxunicode: ' + str(sys.maxunicode)
 
-def print_cmd_ver(cmdlist, label=None):
+def print_stdout(cmdlist, label=None):
+    print
     try:
         res = subprocess.Popen(cmdlist, stdin=open(os.devnull),
                                stdout=subprocess.PIPE).communicate()[0]
         if label is None:
             label = cmdlist[0]
-        print
-        print label + ': ' + res.replace("\n", " ")
+        print label + ': ' + foldlines(res)
     except EnvironmentError:
-        sys.stderr.write("Got exception invoking '%s'. Exception follows.\n" % (cmdlist[0],))
+        sys.stderr.write("\nGot exception invoking '%s'. Exception follows.\n" % (cmdlist[0],))
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 def print_as_ver():
+    print
     if os.path.exists('a.out'):
-        print
         print "WARNING: a file named a.out exists, and getting the version of the 'as' assembler writes to that filename, so I'm not attempting to get the version of 'as'."
         return
     try:
         res = subprocess.Popen(['as', '-version'], stdin=open(os.devnull),
-                               stderr=subprocess.PIPE).communicate()[1]
-        print
-        print 'as: ' + res.replace("\n", " ")
-        os.remove('a.out')
+                               stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+        print 'as: ' + foldlines(res[0]+' '+res[1])
+        if os.path.exists('a.out'):
+            os.remove('a.out')
     except EnvironmentError:
-        sys.stderr.write("Got exception invoking '%s'. Exception follows.\n" % ('as',))
+        sys.stderr.write("\nGot exception invoking '%s'. Exception follows.\n" % ('as',))
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 def print_setuptools_ver():
+    print
     try:
         import pkg_resources
         out = str(pkg_resources.require("setuptools"))
-        print
-        print "setuptools:", out.replace("\n", " ")
+        print "setuptools:", foldlines(out)
     except (ImportError, EnvironmentError):
-        sys.stderr.write("Got exception using 'pkg_resources' to get the version of setuptools. Exception follows\n")
+        sys.stderr.write("\nGot exception using 'pkg_resources' to get the version of setuptools. Exception follows\n")
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 def print_py_pkg_ver(pkgname):
+    print
     try:
         import pkg_resources
         out = str(pkg_resources.require(pkgname))
-        print
-        print pkgname + ': ' + out.replace("\n", " ")
+        print pkgname + ': ' + foldlines(out)
     except (ImportError, EnvironmentError):
-        sys.stderr.write("Got exception using 'pkg_resources' to get the version of %s. Exception follows.\n" % (pkgname,))
+        sys.stderr.write("\nGot exception using 'pkg_resources' to get the version of %s. Exception follows.\n" % (pkgname,))
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
     except pkg_resources.DistributionNotFound:
-        sys.stderr.write("pkg_resources reported no %s package installed. Exception follows.\n" % (pkgname,))
+        sys.stderr.write("\npkg_resources reported no %s package installed. Exception follows.\n" % (pkgname,))
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 print_platform()
 
 print_python_ver()
 
-print_cmd_ver(['buildbot', '--version'])
-print_cmd_ver(['cl'])
-print_cmd_ver(['gcc', '--version'])
-print_cmd_ver(['darcs', '--version'])
-print_cmd_ver(['darcs', '--exact-version'], label='darcs-exact-version')
-print_cmd_ver(['7za'])
+print_stdout(['buildbot', '--version'])
+print_stdout(['cl'])
+print_stdout(['gcc', '--version'])
+print_stdout(['darcs', '--version'])
+print_stdout(['darcs', '--exact-version'], label='darcs-exact-version')
+print_stdout(['7za'])
 
 print_setuptools_ver()