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 8d2178195364bbbcf197e56a981dc2e773dbaa8c..8e163233a0a7b8523bd663b8346f243477004995 100644 (file)
--- 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 \