[gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/, pym/_emerge/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     c752202d57a1e3163aded69301e2d71d1ea26ae7
Author:     Sebastian Luther <SebastianLuther <AT> gmx <DOT> de>
AuthorDate: Tue Nov 26 20:06:23 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 07:44:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c752202d

Fix a missing rebuild

The dependency in the ebuild was changed from
slot operator to no slot operator. The vdb
contained the slot operator and emerge would
refuse to rebuild, causing a missed update.

URL: https://bugs.gentoo.org/490362

---
 pym/_emerge/depgraph.py                            |  3 +-
 .../tests/resolver/test_slot_conflict_rebuild.py   | 55 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 033057b..da2e604 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1301,8 +1301,7 @@ class depgraph(object):
 			selected_atoms = None
 
 			for atom in replacement_parent.validated_atoms:
-				if not atom.slot_operator == "=" or \
-					atom.blocker or \
+				if atom.blocker or \
 					atom.cp != dep.atom.cp:
 					continue
 

diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
index 96cc8f1..9fd9164 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
+++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
@@ -180,3 +180,58 @@ class SlotConflictRebuildTestCase(TestCase):
 				self.assertEqual(test_case.test_success, True, test_case.fail_msg)
 		finally:
 			playground.cleanup()
+
+	def testSlotConflictDepChange(self):
+		"""
+		Bug 490362
+		The dependency in the ebuild was changed form slot operator to
+		no slot operator. The vdb contained the slot operator and emerge
+		would refuse to rebuild.
+		"""
+		ebuilds = {
+			"app-misc/A-1" : {
+				"EAPI": "5",
+				"DEPEND": "app-misc/B",
+				"RDEPEND": "app-misc/B"
+			},
+
+			"app-misc/B-1" : {
+				"EAPI": "5",
+				"SLOT": "0/1"
+			},
+
+			"app-misc/B-2" : {
+				"EAPI": "5",
+				"SLOT": "0/2"
+			},
+		}
+
+		installed = {
+			"app-misc/A-1" : {
+				"EAPI": "5",
+				"DEPEND": "app-misc/B:0/1=",
+				"RDEPEND": "app-misc/B:0/1="
+			},
+			"app-misc/B-1" : {
+				"EAPI": "5",
+				"SLOT": "0/1"
+			},
+		}
+
+		test_cases = (
+			ResolverPlaygroundTestCase(
+				["app-misc/B"],
+				success = True,
+				mergelist = ['app-misc/B-2', 'app-misc/A-1']),
+		)
+
+		world = ["app-misc/A"]
+
+		playground = ResolverPlayground(ebuilds=ebuilds,
+			installed=installed, world=world, debug=False)
+		try:
+			for test_case in test_cases:
+				playground.run_TestCase(test_case)
+				self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+		finally:
+			playground.cleanup()