X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ecc4ea809452d95ab51ff8669d66fe0549260377..94187a80bd60baab4b9c4b949ad820d730578123:/tools/showbuildenv

diff --git a/tools/showbuildenv b/tools/showbuildenv
index 089eea75..81f278e8 100755
--- a/tools/showbuildenv
+++ b/tools/showbuildenv
@@ -5,16 +5,17 @@
 # build environment on machines they can't login on.  It also provides
 # a history in the build logs that might be useful in catching
 # regressions.
-# 
+#
 # This script should *only* report basic information about the build
 # environment, and only that necessary to reproduce the build
 # environment.
 #
-# FIXME: Document meaning of script's exit status, if any.
-# It jumps through hoops with `|| true' despite not using `set -e'.
+# The script's exit status must be zero if all went acceptably well as
+# buildbot checks for this and marks the `environment' stage as failed
+# otherwise.
 
 offset () {
-    sed -e '/./s/^/    /'
+    sed -e '/./s/^/    /' "$@"
 }
 
 header () {
@@ -34,7 +35,7 @@ for f in \
     ; do
     test -f $f || continue
     header $f
-    cat $f
+    offset $f
     break
 done
 
@@ -63,11 +64,8 @@ case ${os} in
 	cc -v 2>&1 | offset
 
   	header Installed packages:
+        #### pkg(7) or pkg_info(1) might not always be available.
 	(pkg info 2>/dev/null | offset) || true
 	(pkg_info 2>/dev/null | offset) || true
 	;;
-
-    Linux)
-        header Linux distribution:
-        (lsb_release -a 2>&1 | offset) || true
 esac