| 1 |
commit: 50bc7775ba7b326c5f7dc384f9f01e2c3e0e4466 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 19:18:59 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 19:18:59 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=50bc7775 |
| 7 |
|
| 8 |
Merge commit 'v2.2.0_alpha76' into prefix |
| 9 |
|
| 10 |
|
| 11 |
cnf/make.conf | 2 +- |
| 12 |
pym/_emerge/JobStatusDisplay.py | 9 +- |
| 13 |
pym/_emerge/Scheduler.py | 202 +++++++++--------------- |
| 14 |
pym/_emerge/actions.py | 2 +- |
| 15 |
pym/_emerge/depgraph.py | 11 -- |
| 16 |
pym/_emerge/main.py | 17 ++- |
| 17 |
pym/_emerge/resolver/output.py | 28 +--- |
| 18 |
pym/_emerge/resolver/output_helpers.py | 4 +- |
| 19 |
pym/portage/checksum.py | 12 ++- |
| 20 |
pym/portage/dbapi/_MergeProcess.py | 58 ------- |
| 21 |
pym/portage/elog/messages.py | 33 +++- |
| 22 |
pym/portage/package/ebuild/config.py | 59 +++++--- |
| 23 |
pym/portage/package/ebuild/doebuild.py | 55 +++++++- |
| 24 |
pym/portage/tests/emerge/test_simple.py | 4 + |
| 25 |
pym/portage/tests/resolver/test_merge_order.py | 8 - |
| 26 |
15 files changed, 231 insertions(+), 273 deletions(-) |
| 27 |
|
| 28 |
diff --cc pym/portage/package/ebuild/config.py |
| 29 |
index aef3c5e,835cd23..b7b23ae |
| 30 |
--- a/pym/portage/package/ebuild/config.py |
| 31 |
+++ b/pym/portage/package/ebuild/config.py |
| 32 |
@@@ -22,9 -22,9 +22,9 @@@ from portage import bsd_chflags, |
| 33 |
load_mod, os, selinux, _unicode_decode |
| 34 |
from portage.const import CACHE_PATH, \ |
| 35 |
DEPCACHE_PATH, INCREMENTALS, MAKE_CONF_FILE, \ |
| 36 |
- MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \ |
| 37 |
+ MODULES_FILE_PATH, \ |
| 38 |
PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \ |
| 39 |
- USER_VIRTUALS_FILE |
| 40 |
+ USER_VIRTUALS_FILE |
| 41 |
from portage.const import _SANDBOX_COMPAT_LEVEL |
| 42 |
from portage.dbapi import dbapi |
| 43 |
from portage.dbapi.porttree import portdbapi |
Archives