diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-11 22:28:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 22:28:16 +0000 |
| commit | 8d8a2c325555dab3ca2c0fb977521d51c57be82b (patch) | |
| tree | 05f845a7df5114b448e2b0f02d203e09b8dbb081 | |
| parent | Add new xpak.5 man page by Lars Hartmann <lars<at>chaotika<dot>org>. (diff) | |
| download | portage-multirepo-8d8a2c325555dab3ca2c0fb977521d51c57be82b.tar.gz portage-multirepo-8d8a2c325555dab3ca2c0fb977521d51c57be82b.tar.bz2 portage-multirepo-8d8a2c325555dab3ca2c0fb977521d51c57be82b.zip | |
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
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 88ec8bde..d103f9ec 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. " + \ |