From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 20 Sep 2010 22:54:15 +0000 (-0700)
Subject: setup: format the output of show-tool-versions for better human-readability
X-Git-Tag: allmydata-tahoe-1.8.0~9
X-Git-Url: https://git.rkrishnan.org/uri?a=commitdiff_plain;h=76594cb955ad34c971f9cd0fb70d8ef48f5eaa5f;p=tahoe-lafs%2Ftahoe-lafs.git

setup: format the output of show-tool-versions for better human-readability
---

diff --git a/misc/build_helpers/show-tool-versions.py b/misc/build_helpers/show-tool-versions.py
index 96185cdf..7e640463 100644
--- a/misc/build_helpers/show-tool-versions.py
+++ b/misc/build_helpers/show-tool-versions.py
@@ -14,8 +14,9 @@ def print_platform():
         if hasattr(platform, 'linux_distribution'):
             print "linux_distribution:", repr(platform.linux_distribution())
     except EnvironmentError:
-        sys.stderr.write("Got exception using 'platform'. Exception follows\n")
+        sys.stderr.write("\nGot exception using 'platform'. Exception follows\n")
         traceback.print_exc(file=sys.stderr)
+        sys.stderr.flush()
         pass
 
 def print_python_ver():
@@ -42,8 +43,9 @@ def print_stdout(cmdlist, label=None):
             label = cmdlist[0]
         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_stderr(cmdlist, label=None):
@@ -55,8 +57,9 @@ def print_stderr(cmdlist, label=None):
             label = cmdlist[0]
         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():
@@ -71,8 +74,9 @@ def print_as_ver():
         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():
@@ -82,8 +86,9 @@ def print_setuptools_ver():
         out = str(pkg_resources.require("setuptools"))
         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):
@@ -93,12 +98,14 @@ def print_py_pkg_ver(pkgname):
         out = str(pkg_resources.require(pkgname))
         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()