Commit 9bc47051 authored by Andrew Murray's avatar Andrew Murray
Browse files

Fixed expected pypy location

parent a8ed293e
...@@ -52,8 +52,14 @@ if [ -n "$VENV" ]; then # in virtualenv ...@@ -52,8 +52,14 @@ if [ -n "$VENV" ]; then # in virtualenv
ingest "Wrong virtualenv pip '$PIP_CMD'" ingest "Wrong virtualenv pip '$PIP_CMD'"
fi fi
else # not virtualenv else # not virtualenv
macpie_bin="$MACPYTHON_PY_PREFIX/$python_mm/bin" if [[ $requested_impl == 'cp' ]]; then
if [ "$PYTHON_EXE" != "$macpie_bin/python$python_mm" ]; then macpie_bin="$MACPYTHON_PY_PREFIX/$python_mm/bin"
bin_name="python$python_mm"
else
macpie_bin="$PWD/pypy$python_mm-v$implementer_version-osx64/bin"
bin_name="pypy"
fi
if [ "$PYTHON_EXE" != "$macpie_bin/$bin_name" ]; then
ingest "Wrong macpython python cmd '$PYTHON_EXE'" ingest "Wrong macpython python cmd '$PYTHON_EXE'"
fi fi
if [ "$PIP_CMD" != "sudo $macpie_bin/pip${python_mm}${expected_pip_args}" ]; then if [ "$PIP_CMD" != "sudo $macpie_bin/pip${python_mm}${expected_pip_args}" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment