commit: d46094a93302301accbce53621efd89dad45a47f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 17:31:07 2014 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 17:31:07 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d46094a9
Merge tag 'v2.2.14' into prefix
Conflicts:
bin/ebuild-helpers/portageq
NEWS | 9 +++++
RELEASE-NOTES | 36 +++++++++++++++++++
bin/ebuild-helpers/portageq | 20 +++++++++--
bin/ebuild-ipc.py | 64 ++++++++++++++++++++++++++++-----
bin/install-qa-check.d/90gcc-warnings | 4 +--
man/emerge.1 | 4 +--
misc/emerge-delta-webrsync | 2 +-
pym/_emerge/main.py | 2 +-
pym/portage/dbapi/vartree.py | 32 ++++++++++++-----
pym/portage/tests/emerge/test_simple.py | 19 ++++++++--
setup.py | 4 +--
11 files changed, 168 insertions(+), 28 deletions(-)
diff --cc bin/ebuild-helpers/portageq
index 2c7c428,4151bac..935f548
--- a/bin/ebuild-helpers/portageq
+++ b/bin/ebuild-helpers/portageq
@@@ -2,9 -2,25 +2,25 @@@
# Copyright 2009-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+ scriptpath=${BASH_SOURCE[0]}
+ scriptname=${scriptpath##*/}
+
-PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
-PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
+PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
+PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
# Use safe cwd, avoiding unsafe import for bug #469338.
cd "${PORTAGE_PYM_PATH}"
- PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
- exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}"
"$PORTAGE_BIN_PATH/portageq" "$@"
+
+ IFS=':'
+ set -f # in case ${PATH} contains any shell glob characters
+
+ for path in ${PATH}; do
+ [[ -x ${path}/${scriptname} ]] || 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
+
+ unset IFS
+ echo "${scriptname}: command not found" 1>&2
+ exit 127
