From 8d8a2c325555dab3ca2c0fb977521d51c57be82b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 22:28:16 +0000 Subject: Bug #262012 - Only trigger the slot conflict message about --newuse when the installed version is the same as the new one. If they are different versions then there's some other problem. svn path=/main/trunk/; revision=13059 --- pym/_emerge/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 88ec8bde3..d103f9ecf 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4865,7 +4865,11 @@ class depgraph(object): # This shouldn't happen. return None - if unmatched_node.installed and not matched_node.installed: + if unmatched_node.installed and not matched_node.installed and \ + unmatched_node.cpv == matched_node.cpv: + # If the conflicting packages are the same version then + # --newuse should be all that's needed. If they are different + # versions then there's some other problem. return "New USE are correctly set, but --newuse wasn't" + \ " requested, so an installed package with incorrect USE " + \ "happened to get pulled into the dependency graph. " + \ -- cgit v1.2.3-1-g7c22