commit: d210680a136e873285c4082a85be26aa4a4d3391
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 10:22:07 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 10:22:41 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d210680a
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
NEWS | 3 +-
RELEASE-NOTES | 20 +++
bin/ebuild-helpers/bsd/sed | 3 +-
bin/ebuild-helpers/portageq | 1 -
bin/ebuild-helpers/unprivileged/chown | 3 +-
bin/ebuild-helpers/xattr/install | 3 +-
bin/ebuild.sh | 4 +-
bin/etc-update | 2 +-
lib/portage/locks.py | 4 +-
lib/portage/package/ebuild/doebuild.py | 27 +---
lib/portage/process.py | 159 +++++++++++++++++++----
lib/portage/sync/modules/rsync/rsync.py | 11 +-
lib/portage/tests/resolver/ResolverPlayground.py | 17 ++-
setup.py | 2 +-
14 files changed, 190 insertions(+), 69 deletions(-)
diff --cc bin/ebuild-helpers/portageq
index b9ac04274,d31bd6810..47640c5a8
--- a/bin/ebuild-helpers/portageq
+++ b/bin/ebuild-helpers/portageq
@@@ -14,10 -14,9 +14,9 @@@ set -f # in case ${PATH} contains any s
for path in ${PATH}; do
[[ -x ${path}/${scriptname} ]] || continue
[[ ${path} == */portage/*/ebuild-helpers* ]] && continue
- [[ ${path} == */._portage_reinstall_.* ]] && continue
[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue
PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
- exec "${PORTAGE_PYTHON:-/usr/bin/python}" \
+ exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" \
"${path}/${scriptname}" "$@"
done
