From d805ec19ca368a07b798d3e687ad5a3d65986fc5 Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <yamashita@geishatokyo.com>
Date: Sun, 15 Jun 2014 12:53:22 +0900
Subject: [PATCH] Pass ez_setup.py and get-pip.py via argument instead of STDIN

AFAIK, Jython 2.7b2 could not handle ez_setup.py via STDIN
---
 plugins/python-build/bin/python-build | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index e1e10313..c21dea94 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1364,6 +1364,8 @@ build_package_verify_py34() {
 }
 
 build_package_ez_setup() {
+  local ez_setup="${BUILD_PATH}/ez_setup.py"
+  rm -f "${ez_setup}"
   { if [ "${EZ_SETUP+defined}" ] && [ -f "${EZ_SETUP}" ]; then
       echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
       cat "${EZ_SETUP}"
@@ -1372,10 +1374,16 @@ build_package_ez_setup() {
       echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
       http get "${EZ_SETUP_URL}"
     fi
-  } | "${PYTHON_BIN}" 1>&4 2>&1
+  } 1> "${ez_setup}"
+  "${PYTHON_BIN}" "${ez_setup}" 1>&4 2>&1 || {
+    echo "error: failed to install setuptools via ez_setup.py" >&2
+    return 1
+  }
 }
 
 build_package_getpip() {
+  local getpip="${BUILD_PATH}/get-pip.py"
+  rm -f "${getpip}"
   { if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then
       echo "Installing pip from ${GET_PIP}..." 1>&2
       cat "${GET_PIP}"
@@ -1384,14 +1392,17 @@ build_package_getpip() {
       echo "Installing pip from ${GET_PIP_URL}..." 1>&2
       http get "${GET_PIP_URL}"
     fi
-  } | "${PYTHON_BIN}" 1>&4 2>&1
+  } 1> "${getpip}"
+  "${PYTHON_BIN}" "${getpip}" 1>&4 2>&1 || {
+    echo "error: failed to install pip via get-pip.py" >&2
+    return 1
+  }
 }
 
 build_package_ensurepip() {
   "$PYTHON_BIN" -m ensurepip 1>/dev/null 2>&1 || {
-    build_package_ez_setup "$@"
-    build_package_getpip "$@"
-  }
+    build_package_ez_setup "$@" && build_package_getpip "$@"
+  } || return 1
 
   create_symlinks "$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"
 }