Revert pantsbuild#7370 (pantsbuild#7656)

This reverts commit db391a8.
cheister · May 3, 2019 · 6437a91 · 6437a91
1 parent c9be6bc
commit 6437a91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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,