From 6437a91200ac348ac8bf3e72cb6502ceb5ed58a2 Mon Sep 17 00:00:00 2001
From: Stu Hood <stuhood@gmail.com>
Date: Fri, 3 May 2019 08:11:27 -0700
Subject: [PATCH] Revert #7370 (#7656)

This reverts commit db391a8f6443e2e66d7982e94fe502d8b3eaa7c0.
---
 build-support/bin/release.sh                    | 4 ++--
 src/python/pants/java/executor.py               | 3 +--
 tests/python/pants_test/java/distribution/BUILD | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build-support/bin/release.sh b/build-support/bin/release.sh
index 27073414e8b..a8981f33a07 100755
--- a/build-support/bin/release.sh
+++ b/build-support/bin/release.sh
@@ -513,7 +513,7 @@ function fetch_and_check_prebuilt_wheels() {
   do
     packages=($(find_pkg "${PACKAGE}" "${PANTS_UNSTABLE_VERSION}" "${check_dir}"))
     if [ ${#packages[@]} -eq 0 ]; then
-      missing+=("${PACKAGE}")
+      missing+=("${NAME}")
       continue
     fi
 
@@ -529,7 +529,7 @@ function fetch_and_check_prebuilt_wheels() {
 
     # N.B. For platform-specific wheels, we expect 6 wheels: {linux,osx} * {cp27m,cp27mu,abi3}.
     if [ "${cross_platform}" != "true" ] && [ ${#packages[@]} -ne 6 ]; then
-      missing+=("${PACKAGE} (expected whls for each platform: had only ${packages[@]})")
+      missing+=("${NAME} (expected whls for each platform: had only ${packages[@]})")
       continue
     fi
   done
diff --git a/src/python/pants/java/executor.py b/src/python/pants/java/executor.py
index fb9e452a52a..7471d24d10b 100644
--- a/src/python/pants/java/executor.py
+++ b/src/python/pants/java/executor.py
@@ -256,5 +256,4 @@ def _spawn(self, cmd, cwd, stdout=None, stderr=None, stdin=None, **subprocess_ar
         return subprocess.Popen(cmd, cwd=cwd, stdin=stdin, stdout=stdout, stderr=stderr,
                                 **subprocess_args)
       except OSError as e:
-        raise self.Error('Problem executing {0} at cwd={1}: {2}'
-                         .format(self._distribution.java, cwd, e))
+        raise self.Error('Problem executing {0}: {1}'.format(self._distribution.java, e))
diff --git a/tests/python/pants_test/java/distribution/BUILD b/tests/python/pants_test/java/distribution/BUILD
index a3a22ca3ab7..3a7fce4422f 100644
--- a/tests/python/pants_test/java/distribution/BUILD
+++ b/tests/python/pants_test/java/distribution/BUILD
@@ -21,11 +21,11 @@ python_tests(
   sources = ['test_distribution_integration.py'],
   dependencies = [
     '3rdparty/python:future',
-    '3rdparty/python/twitter/commons:twitter.common.collections',
     'src/python/pants/java/distribution',
     'src/python/pants/util:osutil',
     'tests/python/pants_test:int-test',
     'tests/python/pants_test/subsystem:subsystem_utils',
+    '3rdparty/python/twitter/commons:twitter.common.collections',
   ],
   tags = {'integration'},
   timeout = 120,