diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-18 11:36:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-18 11:36:47 +0000 |
| commit | 4411629ce8fd881f60119ee781fe51eb69254fe5 (patch) | |
| tree | f43946935dd613e58aac275a40a705c4eebca149 /bin | |
| parent | 7bc280b0eb80bb60c8654d121b24d547e9ead421 (diff) | |
| download | portage-4411629ce8fd881f60119ee781fe51eb69254fe5.tar.gz portage-4411629ce8fd881f60119ee781fe51eb69254fe5.tar.bz2 portage-4411629ce8fd881f60119ee781fe51eb69254fe5.zip | |
Allow packages matched by something in package.provided to be explicitly merged by the user.
svn path=/main/trunk/; revision=4475
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 6 insertions, 5 deletions
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 = [] |