1 |
commit: 2aee99c23f5917605b86ff28b0c395916fe99ea1 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 6 11:49:41 2012 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 6 11:49:41 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2aee99c2 |
7 |
|
8 |
Merge commit 'v2.2.0_alpha100' into multilib |
9 |
|
10 |
|
11 |
bin/misc-functions.sh | 6 ++++-- |
12 |
pym/_emerge/Scheduler.py | 6 +++++- |
13 |
pym/_emerge/actions.py | 2 +- |
14 |
pym/_emerge/depgraph.py | 12 +++++++++++- |
15 |
pym/_emerge/resolver/slot_collision.py | 18 +++++++++++++++--- |
16 |
pym/_emerge/unmerge.py | 15 ++++++++++++++- |
17 |
pym/portage/package/ebuild/config.py | 8 ++++---- |
18 |
pym/portage/package/ebuild/doebuild.py | 3 +-- |
19 |
pym/portage/tests/util/test_getconfig.py | 26 +++++++++++++++++++++++++- |
20 |
9 files changed, 80 insertions(+), 16 deletions(-) |