Allow packages matched by something in package.provided to be explicitly merged by...

svn path=/main/trunk/; revision=4475

diff --git a/bin/emerge b/bin/emerge
index 9821bd29096504054a5a664c47ee71eb1bc90b7a..91fe2b4e004c2635d584b93e658d71fb0d6118b7 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1085,11 +1085,12 @@ class depgraph:
                                selected_pkg = ["blocks", myroot, x[1:], None]
                        else:
                                #We are not processing a blocker but a normal dependency
-                               pkg_key = portage.dep_getkey(x)
-                               if pkg_key in pkgsettings.pprovideddict and \
-                                       portage.match_from_list(
-                                               x, pkgsettings.pprovideddict[pkg_key]):
-                                               continue
+                               if not arg:
+                                       pkg_key = portage.dep_getkey(x)
+                                       if pkg_key in pkgsettings.pprovideddict and \
+                                               portage.match_from_list(
+                                                       x, pkgsettings.pprovideddict[pkg_key]):
+                                                       continue
 
                                # List of acceptable packages, ordered by type preference.
                                matched_packages = []