From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 18 Sep 2006 11:36:47 +0000 (-0000)
Subject: Allow packages matched by something in package.provided to be explicitly merged by... 
X-Git-Tag: v2.1.1-r1~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4411629ce8fd881f60119ee781fe51eb69254fe5;p=portage.git

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

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

diff --git a/bin/emerge b/bin/emerge
index 9821bd290..91fe2b4e0 100755
--- 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 = []