1 |
commit: a173ae4f96adebc538b3acd1c9814ca7c126b667 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 1 13:54:56 2011 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 1 13:54:56 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a173ae4f |
7 |
|
8 |
Merge commit 'v2.2.0_alpha60' into multilib |
9 |
|
10 |
|
11 |
bin/archive-conf | 2 +- |
12 |
bin/dispatch-conf | 33 + |
13 |
bin/ebuild | 6 +- |
14 |
bin/emerge-webrsync | 1 + |
15 |
bin/etc-update | 11 +- |
16 |
bin/misc-functions.sh | 35 +- |
17 |
bin/portageq | 48 +- |
18 |
bin/repoman | 40 +- |
19 |
cnf/dispatch-conf.conf | 10 +- |
20 |
cnf/etc-update.conf | 12 +- |
21 |
man/emerge.1 | 21 +- |
22 |
man/make.conf.5 | 4 - |
23 |
man/portage.5 | 3 + |
24 |
pym/_emerge/EbuildFetcher.py | 21 +- |
25 |
pym/_emerge/actions.py | 3 +- |
26 |
pym/_emerge/create_depgraph_params.py | 16 + |
27 |
pym/_emerge/depgraph.py | 170 ++++- |
28 |
pym/_emerge/help.py | 794 +------------------- |
29 |
pym/_emerge/main.py | 40 +- |
30 |
pym/_emerge/resolver/backtracking.py | 25 + |
31 |
pym/_emerge/resolver/output_helpers.py | 4 +- |
32 |
pym/portage/const.py | 1 - |
33 |
pym/portage/dbapi/__init__.py | 106 ++-- |
34 |
pym/portage/dbapi/porttree.py | 328 +++++---- |
35 |
pym/portage/dbapi/vartree.py | 37 +- |
36 |
pym/portage/dep/__init__.py | 9 + |
37 |
pym/portage/manifest.py | 15 +- |
38 |
pym/portage/package/ebuild/config.py | 4 +- |
39 |
pym/portage/package/ebuild/digestcheck.py | 3 +- |
40 |
pym/portage/package/ebuild/digestgen.py | 6 + |
41 |
pym/portage/package/ebuild/doebuild.py | 11 +- |
42 |
pym/portage/package/ebuild/fetch.py | 1 - |
43 |
pym/portage/package/ebuild/getmaskingstatus.py | 4 +- |
44 |
pym/portage/repository/config.py | 24 +- |
45 |
pym/portage/tests/emerge/test_simple.py | 9 + |
46 |
pym/portage/tests/resolver/ResolverPlayground.py | 22 +- |
47 |
pym/portage/tests/resolver/test_autounmask.py | 103 +++ |
48 |
pym/portage/tests/resolver/test_backtracking.py | 43 ++ |
49 |
.../tests/resolver/test_circular_choices.py | 61 ++ |
50 |
pym/portage/tests/resolver/test_complete_graph.py | 66 ++ |
51 |
pym/portage/tests/resolver/test_virtual_slot.py | 49 ++ |
52 |
pym/portage/util/env_update.py | 31 +- |
53 |
pym/repoman/herdbase.py | 4 - |
54 |
43 files changed, 1053 insertions(+), 1183 deletions(-) |