From 8626fa2c615240960e2bc3f78169fae87addf66e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 12 Mar 2009 05:54:20 +0000 Subject: [PATCH] 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. (trunk r13059) svn path=/main/branches/2.1.6/; revision=13073 --- pym/_emerge/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index efbd2afd5..878812b9a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4849,7 +4849,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. " + \ -- 2.26.2