1 |
commit: 269ac6cf72f48bcf4f8042a3b4d0448e72a1d3c3 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 30 18:55:26 2012 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 30 18:55:26 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=269ac6cf |
7 |
|
8 |
Merge commit 'v2.2.0_alpha96' into multilib |
9 |
|
10 |
|
11 |
Makefile | 5 +- |
12 |
bin/emerge-webrsync | 12 ++++- |
13 |
bin/etc-update | 5 +- |
14 |
bin/repoman | 4 +- |
15 |
pym/_emerge/BlockerCache.py | 2 +- |
16 |
pym/_emerge/CompositeTask.py | 2 +- |
17 |
pym/_emerge/EbuildFetcher.py | 14 ++---- |
18 |
pym/_emerge/JobStatusDisplay.py | 2 +- |
19 |
pym/_emerge/Package.py | 4 +- |
20 |
pym/_emerge/PollScheduler.py | 2 +- |
21 |
pym/_emerge/QueueScheduler.py | 2 +- |
22 |
pym/_emerge/Scheduler.py | 10 ++-- |
23 |
pym/_emerge/_flush_elog_mod_echo.py | 2 +- |
24 |
pym/_emerge/actions.py | 45 ++++++++++---------- |
25 |
pym/_emerge/depgraph.py | 12 +++--- |
26 |
pym/_emerge/main.py | 2 +- |
27 |
pym/_emerge/resolver/output.py | 8 ++-- |
28 |
pym/_emerge/unmerge.py | 14 ++++--- |
29 |
pym/_emerge/userquery.py | 6 +- |
30 |
pym/portage/cache/mappings.py | 2 +- |
31 |
pym/portage/dbapi/_MergeProcess.py | 13 +---- |
32 |
pym/portage/dbapi/bintree.py | 6 +- |
33 |
pym/portage/dbapi/porttree.py | 6 +- |
34 |
pym/portage/dbapi/vartree.py | 10 ++-- |
35 |
pym/portage/dep/__init__.py | 2 +- |
36 |
pym/portage/env/loaders.py | 4 +- |
37 |
pym/portage/glsa.py | 8 ++-- |
38 |
pym/portage/locks.py | 22 +++++++++- |
39 |
pym/portage/news.py | 2 +- |
40 |
pym/portage/package/ebuild/_ipc/QueryCommand.py | 2 +- |
41 |
pym/portage/package/ebuild/digestcheck.py | 2 +- |
42 |
pym/portage/package/ebuild/digestgen.py | 2 +- |
43 |
pym/portage/package/ebuild/doebuild.py | 4 +- |
44 |
pym/portage/process.py | 18 +++++++- |
45 |
pym/portage/tests/locks/test_lock_nonblock.py | 5 ++- |
46 |
pym/portage/util/ExtractKernelVersion.py | 2 +- |
47 |
pym/portage/util/__init__.py | 3 +- |
48 |
.../util/_dyn_libs/PreservedLibsRegistry.py | 2 +- |
49 |
pym/portage/util/_eventloop/EventLoop.py | 2 +- |
50 |
pym/portage/util/_pty.py | 2 +- |
51 |
pym/portage/util/lafilefixer.py | 2 +- |
52 |
pym/portage/util/listdir.py | 2 +- |
53 |
pym/portage/util/movefile.py | 23 ++++++---- |
54 |
pym/repoman/utilities.py | 6 +- |
55 |
44 files changed, 170 insertions(+), 135 deletions(-) |