commit:     c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:32:31 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:32:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7938eca

Merge tag 'portage-2.3.6' into multilib

 RELEASE-NOTES                                      |  29 +++
 bin/ebuild-helpers/dosym                           |  17 +-
 bin/emirrordist                                    |   8 +
 bin/phase-functions.sh                             |   5 +-
 bin/phase-helpers.sh                               |   8 +-
 man/ebuild.5                                       |   6 +-
 man/emerge.1                                       |  19 +-
 pym/_emerge/AsynchronousLock.py                    |  89 +++++++-
 pym/_emerge/EbuildBuild.py                         |  23 +-
 pym/_emerge/EbuildPhase.py                         |  14 +-
 pym/_emerge/PollScheduler.py                       |  57 +++--
 pym/_emerge/Scheduler.py                           |  10 +-
 pym/_emerge/SpawnProcess.py                        |   3 +-
 pym/_emerge/SubProcess.py                          |  23 +-
 pym/_emerge/UseFlagDisplay.py                      |  19 +-
 pym/_emerge/actions.py                             |  17 +-
 pym/_emerge/depgraph.py                            | 202 ++++++++++++++---
 pym/_emerge/main.py                                |  12 ++
 pym/portage/_emirrordist/FetchIterator.py          |  21 ++
 pym/portage/_emirrordist/MirrorDistTask.py         |  47 ++--
 pym/portage/dbapi/bintree.py                       |  19 +-
 pym/portage/dbapi/vartree.py                       |  22 +-
 pym/portage/package/ebuild/_spawn_nofetch.py       | 106 +++++----
 pym/portage/package/ebuild/config.py               |   3 -
 pym/portage/package/ebuild/doebuild.py             |   2 +-
 pym/portage/package/ebuild/prepare_build_dirs.py   |  13 ++
 pym/portage/tests/ebuild/test_ipc_daemon.py        |   3 +-
 pym/portage/tests/locks/test_asynchronous_lock.py  |  15 +-
 pym/portage/tests/resolver/test_autounmask.py      |  57 ++++-
 .../tests/resolver/test_autounmask_use_breakage.py |  40 ++++
 .../resolver/test_binary_pkg_ebuild_visibility.py  | 144 +++++++++++++
 .../tests/resolver/test_onlydeps_minimal.py        |  47 ++++
 .../test_slot_conflict_unsatisfied_deep_deps.py    |  61 ++++++
 ...ask.py => test_slot_operator_complete_graph.py} |  23 +-
 .../resolver/test_slot_operator_exclusive_slots.py |  39 ++++
 .../modules => tests/util/eventloop}/__init__.py   |   0
 .../tests/{bin => util/eventloop}/__test__.py      |   0
 .../tests/util/eventloop/test_call_soon_fifo.py    |  30 +++
 .../modules => tests/util/futures}/__init__.py     |   0
 .../tests/{bin => util/futures}/__test__.py        |   0
 .../tests/util/futures/test_done_callback.py       |  35 +++
 pym/portage/tests/util/test_digraph.py             |   6 +-
 pym/portage/util/_async/AsyncScheduler.py          |  16 +-
 pym/portage/util/_async/SchedulerInterface.py      |   6 +-
 pym/portage/util/_eventloop/EventLoop.py           |  99 ++++++++-
 pym/portage/util/digraph.py                        |  35 ++-
 pym/portage/util/futures/futures.py                | 238 ++++++++++++++-------
 repoman/man/repoman.1                              |   4 +
 repoman/pym/repoman/modules/scan/ebuild/checks.py  |  13 ++
 repoman/pym/repoman/qa_data.py                     |   4 +
 setup.py                                           |   7 +-
 src/portage_util_file_copy_reflink_linux.c         |  19 +-
 52 files changed, 1433 insertions(+), 302 deletions(-)

diff --cc bin/phase-functions.sh
index 5633d6313,dfd8733c8..b98023702
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -306,8 -281,9 +306,9 @@@ __dyn_clean() 
                        "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
                        "$PORTAGE_BUILDDIR"/.exit_status
  
-               rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
-               rm -rf "${WORKDIR}"*
 -              rm -rf "${PORTAGE_BUILDDIR}/build-info"
++              rm -rf "${PORTAGE_BUILDDIR}/{build-info,abi-code}"
+               rm -rf "${WORKDIR}"
+               rm -f "${PORTAGE_BUILDDIR}/files"
        fi
  
        if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then

Reply via email to