diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-17 19:30:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-17 19:30:23 +0000 |
| commit | c99dd9743bf7aaa628148d6f9644bccf5a357c77 (patch) | |
| tree | 225249902b0a71f730bcacaeab3a4245b2709ee5 | |
| parent | 25a47f7b049fcd3349f050b1b271ba750d68d155 (diff) | |
| download | portage-c99dd9743bf7aaa628148d6f9644bccf5a357c77.tar.gz portage-c99dd9743bf7aaa628148d6f9644bccf5a357c77.tar.bz2 portage-c99dd9743bf7aaa628148d6f9644bccf5a357c77.zip | |
Fix package.provided breakage from the fix for bug #166939.
svn path=/main/trunk/; revision=5984
| -rw-r--r-- | pym/emerge/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index e6c4cd516..96bad6761 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -1522,6 +1522,10 @@ class depgraph: dependencies are satisfiable. """ if arg: mymerge = [depstring] + pprovided = pkgsettings.pprovideddict.get( + portage.dep_getkey(depstring)) + if pprovided and portage.match_from_list(depstring, pprovided): + mymerge = [] else: try: if myparent and p_status == "nomerge": |