1 |
commit: f4a14182fed2fc42054755296ee434c81e8baca6 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 19 14:25:03 2011 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 19 14:25:03 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f4a14182 |
7 |
|
8 |
Merge commit 'v2.2.0_alpha76' into multilib |
9 |
|
10 |
|
11 |
pym/_emerge/Scheduler.py | 141 ++++++------------------ |
12 |
pym/_emerge/depgraph.py | 11 -- |
13 |
pym/_emerge/main.py | 14 ++- |
14 |
pym/_emerge/resolver/output.py | 28 +---- |
15 |
pym/_emerge/resolver/output_helpers.py | 4 +- |
16 |
pym/portage/dbapi/_MergeProcess.py | 58 ---------- |
17 |
pym/portage/elog/messages.py | 33 ++++-- |
18 |
pym/portage/package/ebuild/config.py | 59 ++++++---- |
19 |
pym/portage/package/ebuild/doebuild.py | 55 +++++++++- |
20 |
pym/portage/tests/resolver/test_merge_order.py | 8 -- |
21 |
10 files changed, 167 insertions(+), 244 deletions(-) |