| 1 |
commit: 458ce208ed25f2d17666926585e14da6166eb9d7 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 18 01:26:01 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 18 01:26:01 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=458ce208 |
| 7 |
|
| 8 |
depgraph: don't merge portage asap |
| 9 |
|
| 10 |
There's no need to do this anymore, because we don't restart since |
| 11 |
commit d3f704a425a50b5cfa997a25866929b30f1b7d0f. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/depgraph.py | 9 --------- |
| 15 |
pym/portage/tests/resolver/test_merge_order.py | 8 -------- |
| 16 |
2 files changed, 0 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 19 |
index 65fe1fd..484206e 100644 |
| 20 |
--- a/pym/_emerge/depgraph.py |
| 21 |
+++ b/pym/_emerge/depgraph.py |
| 22 |
@@ -4996,15 +4996,6 @@ class depgraph(object): |
| 23 |
if replacement_portage == running_portage: |
| 24 |
replacement_portage = None |
| 25 |
|
| 26 |
- if replacement_portage is not None and \ |
| 27 |
- (running_portage is None or \ |
| 28 |
- running_portage.cpv != replacement_portage.cpv or \ |
| 29 |
- '9999' in replacement_portage.cpv or \ |
| 30 |
- 'git' in replacement_portage.inherited or \ |
| 31 |
- 'git-2' in replacement_portage.inherited): |
| 32 |
- # update from running_portage to replacement_portage asap |
| 33 |
- asap_nodes.append(replacement_portage) |
| 34 |
- |
| 35 |
if running_portage is not None: |
| 36 |
try: |
| 37 |
portage_rdepend = self._select_atoms_highest_available( |
| 38 |
|
| 39 |
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py |
| 40 |
index 0a52c81..adff84d 100644 |
| 41 |
--- a/pym/portage/tests/resolver/test_merge_order.py |
| 42 |
+++ b/pym/portage/tests/resolver/test_merge_order.py |
| 43 |
@@ -410,14 +410,6 @@ class MergeOrderTestCase(TestCase): |
| 44 |
["media-video/libav"], |
| 45 |
success=True, |
| 46 |
mergelist = ['media-video/libav-0.7_pre20110327', 'media-video/ffmpeg-0.7_rc1', '!media-video/ffmpeg']), |
| 47 |
- # Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally, |
| 48 |
- # satisfied deps are always merged after the asap nodes that |
| 49 |
- # depend on them. |
| 50 |
- ResolverPlaygroundTestCase( |
| 51 |
- ["dev-lang/python", portage.const.PORTAGE_PACKAGE_ATOM], |
| 52 |
- success = True, |
| 53 |
- all_permutations = True, |
| 54 |
- mergelist = ['app-admin/eselect-python-20100321', 'sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), |
| 55 |
# Test that OS_HEADERS_PACKAGE_ATOM and LIBC_PACKAGE_ATOM |
| 56 |
# are merged asap, in order to account for implicit |
| 57 |
# dependencies. See bug #303567. Optimally, satisfied deps |
Archives