| 1 |
commit: 9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 29 12:23:31 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 29 12:23:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9db5b4a8 |
| 7 |
|
| 8 |
Merge tag 'v2.2.0_alpha142' into multilib |
| 9 |
|
| 10 |
|
| 11 |
.gitignore | 1 + |
| 12 |
bin/misc-functions.sh | 19 ++- |
| 13 |
cnf/make.globals | 2 +- |
| 14 |
man/make.conf.5 | 5 + |
| 15 |
pym/_emerge/PipeReader.py | 6 +- |
| 16 |
pym/_emerge/SpawnProcess.py | 165 ++++---------------- |
| 17 |
pym/_emerge/actions.py | 18 ++ |
| 18 |
pym/_emerge/depgraph.py | 37 ++++- |
| 19 |
pym/_emerge/resolver/backtracking.py | 26 +++- |
| 20 |
pym/portage/const.py | 1 + |
| 21 |
pym/portage/dbapi/_MergeProcess.py | 6 + |
| 22 |
pym/portage/dbapi/vartree.py | 140 ++++++++++++++++- |
| 23 |
pym/portage/emaint/modules/logs/__init__.py | 2 +- |
| 24 |
pym/portage/tests/process/test_PopenProcess.py | 44 +++++- |
| 25 |
.../tests/resolver/test_slot_conflict_rebuild.py | 107 +++++++++++++ |
| 26 |
.../resolver/test_slot_operator_unsatisfied.py | 70 ++++++++ |
| 27 |
pym/portage/util/_async/PipeLogger.py | 146 +++++++++++++++++ |
| 28 |
pym/portage/util/_ctypes.py | 47 ++++++ |
| 29 |
18 files changed, 688 insertions(+), 154 deletions(-) |
| 30 |
|
| 31 |
diff --cc pym/portage/const.py |
| 32 |
index 58ec887,8c5bbf3..fe53907 |
| 33 |
--- a/pym/portage/const.py |
| 34 |
+++ b/pym/portage/const.py |
| 35 |
@@@ -95,8 -94,9 +95,9 @@@ SUPPORTED_FEATURES = frozenset( |
| 36 |
"compress-index", "config-protect-if-modified", |
| 37 |
"digest", "distcc", "distcc-pump", "distlocks", |
| 38 |
"downgrade-backup", "ebuild-locks", "fakeroot", |
| 39 |
- "fail-clean", "force-mirror", "force-prefix", "getbinpkg", |
| 40 |
+ "fail-clean", "force-mirror", "force-multilib", "force-prefix", "getbinpkg", |
| 41 |
"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror", |
| 42 |
+ "merge-sync", |
| 43 |
"metadata-transfer", "mirror", "multilib-strict", "news", |
| 44 |
"noauto", "noclean", "nodoc", "noinfo", "noman", |
| 45 |
"nostrip", "notitles", "parallel-fetch", "parallel-install", |
Archives