commit: 2988e14465a24de9db00f5899239cb739e5de083
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:32:23 2016 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:32:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2988e144
merge v2.2.26
RELEASE-NOTES | 12 ++++++
bin/egencache | 6 +--
bin/phase-functions.sh | 13 ++++++-
bin/phase-helpers.sh | 17 +++++----
pym/_emerge/SpawnProcess.py | 37 +++++++++++++++++--
pym/_emerge/depgraph.py | 35 +++++++++++++++++-
pym/portage/repository/config.py | 14 ++-----
pym/portage/sync/controller.py | 7 ++++
pym/portage/sync/modules/cvs/__init__.py | 4 +-
.../tests/resolver/test_autounmask_parent.py | 43 ++++++++++++++++++++++
pym/portage/util/locale.py | 7 ++--
setup.py | 2 +-
12 files changed, 164 insertions(+), 33 deletions(-)
diff --cc bin/phase-functions.sh
index 6f98569,042e242..96ed339
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -222,32 -219,13 +222,38 @@@ __dyn_pretend()
}
__dyn_setup() {
+ if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then
+ __vecho ">>> It appears that '$PF' is already setup; skipping."
+ __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force
setup."
- return 0
++ return
++ fi
++
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ;
then
+ ewarn
+ ewarn "You disabled all ABIs"
+ ewarn "You should enable at least one ABI"
+ ewarn "Enabling the default ABI now"
+ ewarn
+ fi
fi
+ for LOOP_ABI in $(get_abi_list); do
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ set_abi ${LOOP_ABI}
+ rm -f "${T}"/environment
+ if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
+ __vecho ">>> It appears that '$PF' is already
setup; skipping."
+ __vecho ">>> Remove
'$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
+ return 0
+ fi
+ fi
__ebuild_phase pre_pkg_setup
__ebuild_phase pkg_setup
+ >> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
+ die "Failed to create $PORTAGE_BUILDDIR/.setuped"
+
+ done
+
>> "$PORTAGE_BUILDDIR/.setuped" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
__ebuild_phase post_pkg_setup
@@@ -270,7 -246,7 +276,7 @@@ __dyn_unpack()
>> "$PORTAGE_BUILDDIR/.unpacked" || \
die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
__vecho ">>> Source unpacked in ${WORKDIR}"
-- __ebuild_phase post_src_unpack
++__ebuild_phase post_src_unpack
}
__dyn_clean() {
@@@ -406,11 -372,14 +412,16 @@@ __dyn_prepare()
trap __abort_prepare SIGINT SIGQUIT
__ebuild_phase pre_src_prepare
- __vecho ">>> Preparing source in $PWD ..."
+ __vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
__ebuild_phase src_prepare
+ done
+
+ # keep path in eapply_user in sync!
+ if ___eapi_has_eapply_user && [[ ! -f
${T}/.portage_user_patches_applied ]]; then
+ die "eapply_user (or default) must be called in src_prepare()!"
+ fi
+
>> "$PORTAGE_BUILDDIR/.prepared" || \
die "Failed to create $PORTAGE_BUILDDIR/.prepared"
__vecho ">>> Source prepared."
