1 |
commit: c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 7 10:32:31 2018 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 7 10:32:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7938eca |
7 |
|
8 |
Merge tag 'portage-2.3.6' into multilib |
9 |
|
10 |
RELEASE-NOTES | 29 +++ |
11 |
bin/ebuild-helpers/dosym | 17 +- |
12 |
bin/emirrordist | 8 + |
13 |
bin/phase-functions.sh | 5 +- |
14 |
bin/phase-helpers.sh | 8 +- |
15 |
man/ebuild.5 | 6 +- |
16 |
man/emerge.1 | 19 +- |
17 |
pym/_emerge/AsynchronousLock.py | 89 +++++++- |
18 |
pym/_emerge/EbuildBuild.py | 23 +- |
19 |
pym/_emerge/EbuildPhase.py | 14 +- |
20 |
pym/_emerge/PollScheduler.py | 57 +++-- |
21 |
pym/_emerge/Scheduler.py | 10 +- |
22 |
pym/_emerge/SpawnProcess.py | 3 +- |
23 |
pym/_emerge/SubProcess.py | 23 +- |
24 |
pym/_emerge/UseFlagDisplay.py | 19 +- |
25 |
pym/_emerge/actions.py | 17 +- |
26 |
pym/_emerge/depgraph.py | 202 ++++++++++++++--- |
27 |
pym/_emerge/main.py | 12 ++ |
28 |
pym/portage/_emirrordist/FetchIterator.py | 21 ++ |
29 |
pym/portage/_emirrordist/MirrorDistTask.py | 47 ++-- |
30 |
pym/portage/dbapi/bintree.py | 19 +- |
31 |
pym/portage/dbapi/vartree.py | 22 +- |
32 |
pym/portage/package/ebuild/_spawn_nofetch.py | 106 +++++---- |
33 |
pym/portage/package/ebuild/config.py | 3 - |
34 |
pym/portage/package/ebuild/doebuild.py | 2 +- |
35 |
pym/portage/package/ebuild/prepare_build_dirs.py | 13 ++ |
36 |
pym/portage/tests/ebuild/test_ipc_daemon.py | 3 +- |
37 |
pym/portage/tests/locks/test_asynchronous_lock.py | 15 +- |
38 |
pym/portage/tests/resolver/test_autounmask.py | 57 ++++- |
39 |
.../tests/resolver/test_autounmask_use_breakage.py | 40 ++++ |
40 |
.../resolver/test_binary_pkg_ebuild_visibility.py | 144 +++++++++++++ |
41 |
.../tests/resolver/test_onlydeps_minimal.py | 47 ++++ |
42 |
.../test_slot_conflict_unsatisfied_deep_deps.py | 61 ++++++ |
43 |
...ask.py => test_slot_operator_complete_graph.py} | 23 +- |
44 |
.../resolver/test_slot_operator_exclusive_slots.py | 39 ++++ |
45 |
.../modules => tests/util/eventloop}/__init__.py | 0 |
46 |
.../tests/{bin => util/eventloop}/__test__.py | 0 |
47 |
.../tests/util/eventloop/test_call_soon_fifo.py | 30 +++ |
48 |
.../modules => tests/util/futures}/__init__.py | 0 |
49 |
.../tests/{bin => util/futures}/__test__.py | 0 |
50 |
.../tests/util/futures/test_done_callback.py | 35 +++ |
51 |
pym/portage/tests/util/test_digraph.py | 6 +- |
52 |
pym/portage/util/_async/AsyncScheduler.py | 16 +- |
53 |
pym/portage/util/_async/SchedulerInterface.py | 6 +- |
54 |
pym/portage/util/_eventloop/EventLoop.py | 99 ++++++++- |
55 |
pym/portage/util/digraph.py | 35 ++- |
56 |
pym/portage/util/futures/futures.py | 238 ++++++++++++++------- |
57 |
repoman/man/repoman.1 | 4 + |
58 |
repoman/pym/repoman/modules/scan/ebuild/checks.py | 13 ++ |
59 |
repoman/pym/repoman/qa_data.py | 4 + |
60 |
setup.py | 7 +- |
61 |
src/portage_util_file_copy_reflink_linux.c | 19 +- |
62 |
52 files changed, 1433 insertions(+), 302 deletions(-) |
63 |
|
64 |
diff --cc bin/phase-functions.sh |
65 |
index 5633d6313,dfd8733c8..b98023702 |
66 |
--- a/bin/phase-functions.sh |
67 |
+++ b/bin/phase-functions.sh |
68 |
@@@ -306,8 -281,9 +306,9 @@@ __dyn_clean() |
69 |
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \ |
70 |
"$PORTAGE_BUILDDIR"/.exit_status |
71 |
|
72 |
- rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code} |
73 |
- rm -rf "${WORKDIR}"* |
74 |
- rm -rf "${PORTAGE_BUILDDIR}/build-info" |
75 |
++ rm -rf "${PORTAGE_BUILDDIR}/{build-info,abi-code}" |
76 |
+ rm -rf "${WORKDIR}" |
77 |
+ rm -f "${PORTAGE_BUILDDIR}/files" |
78 |
fi |
79 |
|
80 |
if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then |