From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 24 Mar 2008 15:09:50 +0000 (-0000)
Subject:    Merged from trunk 9494:9496
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2386f98d8b873f671318c4fdc1c9f592f09d65fa;p=portage.git

   Merged from trunk 9494:9496

   | 9495    | Fix depgraph._select_package() to make sure the installed    |
   | zmedico | package is a real match before rejecting other available     |
   |         | packages.                                                    |

   | 9496    | Improve logic from the previous commit.                      |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=9501
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8d2178195..8e163233a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2745,7 +2745,7 @@ class depgraph(object):
 							(myarg and not selective)
 						if not reinstall_for_flags and \
 							not must_reinstall and \
-							vardb.cpv_exists(cpv):
+							cpv in vardb.match(atom):
 							break
 					if installed:
 						must_reinstall = empty or \