diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-11-17 17:26:01 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-17 17:26:01 -0800 |
| commit | 458ce208ed25f2d17666926585e14da6166eb9d7 (patch) | |
| tree | 67e78a57832eae16a4dd50fae8f3d30dbb7781e6 | |
| parent | Tweak the last commit. (diff) | |
| download | portage-458ce208ed25f2d17666926585e14da6166eb9d7.tar.gz portage-458ce208ed25f2d17666926585e14da6166eb9d7.tar.bz2 portage-458ce208ed25f2d17666926585e14da6166eb9d7.zip | |
depgraph: don't merge portage asap
There's no need to do this anymore, because we don't restart since
commit d3f704a425a50b5cfa997a25866929b30f1b7d0f.
| -rw-r--r-- | pym/_emerge/depgraph.py | 9 | ||||
| -rw-r--r-- | pym/portage/tests/resolver/test_merge_order.py | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 65fe1fda2..484206eb7 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4996,15 +4996,6 @@ class depgraph(object): if replacement_portage == running_portage: replacement_portage = None - if replacement_portage is not None and \ - (running_portage is None or \ - running_portage.cpv != replacement_portage.cpv or \ - '9999' in replacement_portage.cpv or \ - 'git' in replacement_portage.inherited or \ - 'git-2' in replacement_portage.inherited): - # update from running_portage to replacement_portage asap - asap_nodes.append(replacement_portage) - if running_portage is not None: try: portage_rdepend = self._select_atoms_highest_available( diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py index 0a52c813b..adff84d2b 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -410,14 +410,6 @@ class MergeOrderTestCase(TestCase): ["media-video/libav"], success=True, mergelist = ['media-video/libav-0.7_pre20110327', 'media-video/ffmpeg-0.7_rc1', '!media-video/ffmpeg']), - # Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally, - # satisfied deps are always merged after the asap nodes that - # depend on them. - ResolverPlaygroundTestCase( - ["dev-lang/python", portage.const.PORTAGE_PACKAGE_ATOM], - success = True, - all_permutations = True, - mergelist = ['app-admin/eselect-python-20100321', 'sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), # Test that OS_HEADERS_PACKAGE_ATOM and LIBC_PACKAGE_ATOM # are merged asap, in order to account for implicit # dependencies. See bug #303567. Optimally, satisfied deps |