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