Browse Source

Apply patch only if there are patches exist for the package

pull/101/head
Yamashita Yuu 10 years ago
parent
commit
a7a99c75eb
1 changed files with 10 additions and 6 deletions
  1. +10
    -6
      plugins/python-build/bin/python-build

+ 10
- 6
plugins/python-build/bin/python-build View File

@ -703,14 +703,17 @@ before_install_package() {
}
before_install_package_patch() {
local package_name="$1"
local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
ORIG_HAS_PATCH="$HAS_PATCH"
# Apply built-in patches if patch was not given from stdin
if [ -z "$HAS_PATCH" ]; then
( cat "${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/$1"/* || true ) 2>/dev/null 1>"$1.patch"
if [ -z "$HAS_PATCH" ] && [ -d "${package_patch_path}" ]; then
( cat "${package_patch_path}"/* || true ) 2>/dev/null 1>"${package_name}.patch"
exec <&-
exec <"$1.patch"
exec <"${package_name}.patch"
HAS_PATCH=true
fi
ORIG_HAS_PATCH="$HAS_PATCH"
HAS_PATCH=true
}
after_install_package() {
@ -719,7 +722,8 @@ after_install_package() {
}
after_install_package_patch() {
rm -f "$1.patch"
local package_name="$1"
rm -f "${package_name}.patch"
HAS_PATCH="$ORIG_HAS_PATCH"
}

Loading…
Cancel
Save