1 |
commit: 48cf4874fb23281bc3679a6b5247167b51e86c1c |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 28 13:13:14 2011 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 28 13:13:14 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=48cf4874 |
7 |
|
8 |
Merge commit 'v2.2.0_alpha37' into multilib |
9 |
|
10 |
|
11 |
bin/etc-update | 2 +- |
12 |
man/emerge.1 | 2 +- |
13 |
pym/_emerge/AsynchronousLock.py | 10 ++-- |
14 |
pym/_emerge/BlockerDB.py | 9 ++- |
15 |
pym/_emerge/FakeVartree.py | 12 ++++- |
16 |
pym/_emerge/depgraph.py | 31 +++++++---- |
17 |
pym/_emerge/unmerge.py | 2 +- |
18 |
pym/portage/dbapi/_MergeProcess.py | 9 +++ |
19 |
pym/portage/dbapi/vartree.py | 105 +++++++++++++++++++----------------- |
20 |
9 files changed, 107 insertions(+), 75 deletions(-) |