mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 15:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/python-utils-r1: Sync with Gentoo

Browse Source 
It's from Gentoo commit bafc7b5a1fc937b08a67be7c628f225674a3303d.
This commit is contained in:
Flatcar Buildbot 2023-08-14 07:11:38 +00:00
parent c201765ebf
commit dc15a4da63
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass vendored
View File

@ -338,7 +338,9 @@ _python_export() {
debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}" debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
;; ;;
PYTHON) PYTHON)
export PYTHON=${BROOT}/usr/bin/${impl} # Under EAPI 7+, this should just use ${BROOT}, but Portage
# <3.0.50 was buggy, and prefix users need this to update.
export PYTHON=${BROOT-${EPREFIX}}/usr/bin/${impl}
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}" debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
;; ;;
PYTHON_SITEDIR) PYTHON_SITEDIR)
@ -1244,14 +1246,13 @@ _python_check_occluded_packages() {
# positives before filing bugs. # positives before filing bugs.
[[ ! ${PYTHON_EXPERIMENTAL_QA} ]] && return [[ ! ${PYTHON_EXPERIMENTAL_QA} ]] && return
type -P diff &>/dev/null || return
[[ -z ${BUILD_DIR} || ! -d ${BUILD_DIR}/install ]] && return [[ -z ${BUILD_DIR} || ! -d ${BUILD_DIR}/install ]] && return
local sitedir="${BUILD_DIR}/install$(python_get_sitedir)" local sitedir="${BUILD_DIR}/install$(python_get_sitedir)"
# avoid unnecessarily checking if we are inside install dir # avoid unnecessarily checking if we are inside install dir
[[ ${sitedir} -ef . ]] && return [[ ${sitedir} -ef . ]] && return
local f fn diff local f fn diff l
for f in "${sitedir}"/*/; do for f in "${sitedir}"/*/; do
f=${f%/} f=${f%/}
fn=${f##*/} fn=${f##*/}
@ -1260,17 +1261,29 @@ _python_check_occluded_packages() {
[[ ${fn} == *.dist-info || ${fn} == *.egg-info ]] && continue [[ ${fn} == *.dist-info || ${fn} == *.egg-info ]] && continue
if [[ -d ${fn} ]]; then if [[ -d ${fn} ]]; then
diff=$(diff -dupr -x "__pycache__" "${fn}" "${sitedir}/${fn}") diff=$(
comm -1 -3 <(
find "${fn}" -type f -not -path '*/__pycache__/*' |
sort
assert
) <(
cd "${sitedir}" &&
find "${fn}" -type f -not -path '*/__pycache__/*' |
sort
assert
)
)
if [[ -n ${diff} ]]; then if [[ -n ${diff} ]]; then
eqawarn "The directory ${fn} occludes package installed for ${EPYTHON}." eqawarn "The directory ${fn} occludes package installed for ${EPYTHON}."
echo eqawarn "The installed package includes additional files:"
echo ">>> Diff:" eqawarn
echo "${diff}" while IFS= read -r l; do
echo "<<< End-of-diff" eqawarn " ${l}"
echo done <<<"${diff}"
eqawarn
if [[ ! ${_PYTHON_WARNED_OCCLUDED_PACKAGES} ]]; then if [[ ! ${_PYTHON_WARNED_OCCLUDED_PACKAGES} ]]; then
eqawarn "The complete build log includes diffs."
eqawarn "For more information on occluded packages, please see:" eqawarn "For more information on occluded packages, please see:"
eqawarn "https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions" eqawarn "https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions"
_PYTHON_WARNED_OCCLUDED_PACKAGES=1 _PYTHON_WARNED_OCCLUDED_PACKAGES=1