From 8892f3735d7ad43cf0e3f21592b3af8dc5a9c71e Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Wed, 1 Jan 2014 12:21:29 +0900 Subject: [PATCH] Use `-p0` for all patches to keep things simple (sstephenson/ruby-build#484) There is filterdiff(1) available to transform strip level of a patch if optional level is required. ``` git diff HEAD^ | filterdiff --strip=1 | pyenv install -p 3.3.3 ``` --- plugins/python-build/bin/python-build | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 085f3102..a7f1bfc3 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1062,19 +1062,9 @@ isolated_gem_install() { } apply_python_patch() { - local package_name="$1" - - # Support PYTHON_PATCH_OPTS, etc. - local package_var_name="$(capitalize "${package_name%%-*}")" - local PACKAGE_PATCH_OPTS="${package_var_name}_PATCH_OPTS" - - if [ -z "${PATCH_OPTS+defined}" ] && [ -z "${!PACKAGE_PATCH_OPTS+defined}" ]; then - local PATCH_OPTS="-p0" - fi - case "$1" in Python-* | jython-* | pypy-* ) - ${PATCH:-patch} $PATCH_OPTS ${!PACKAGE_PATCH_OPTS} -i "${2:--}" + patch -p0 -i "${2:--}" ;; esac }