From c806de29f1ffe5bf81c85b951b461ae382db39a1 Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Thu, 10 Aug 2017 17:42:12 -0400
Subject: cleanup

---
 jenkins/dispatch.groovy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index de7342e..1b86060 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -171,8 +171,10 @@ node(LABEL) {
         sh "conda install --quiet --yes ${cpkgs} python=${PY_VERSION}"
 
         // Apply bugfix patch only to conda_build 2.x
+        // py2 conda-build outputs version string to stderr
+        // whereas the py3 version outputs it to stdout. Merge output streams here to capture
+        // all output under both circumstances.
         def conda_build_version = sh(script: "conda-build --version 2>&1", returnStdout: true).trim()
-        println(" **>> conda_build_version = ${conda_build_version}")
         def conda_build_maj_ver = conda_build_version.tokenize()[1].tokenize('.')[0]
         if (conda_build_maj_ver == "2") {
             println("conda-build major version ${conda_build_maj_ver} detected. Applying bugfix patch.")
-- 
cgit