1 |
On Sat, 11 Jul 2015 21:58:40 -0700 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Since commit 11467fc640995e3dc8897c82bbc7130d5bf27d05, only Atom |
5 |
> instances are allowed to be passed into match_pkgs calls. |
6 |
> |
7 |
> Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug |
8 |
> 282639)") X-Gentoo-Bug: 554578 |
9 |
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=554578 |
10 |
> --- |
11 |
> pym/_emerge/BlockerDB.py | 5 +++-- |
12 |
> 1 file changed, 3 insertions(+), 2 deletions(-) |
13 |
> |
14 |
> diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py |
15 |
> index 8bb8f5f..44a70a0 100644 |
16 |
> --- a/pym/_emerge/BlockerDB.py |
17 |
> +++ b/pym/_emerge/BlockerDB.py |
18 |
> @@ -1,4 +1,4 @@ |
19 |
> -# Copyright 1999-2012 Gentoo Foundation |
20 |
> +# Copyright 1999-2015 Gentoo Foundation |
21 |
> # Distributed under the terms of the GNU General Public License v2 |
22 |
> |
23 |
> import sys |
24 |
> @@ -7,6 +7,7 @@ import portage |
25 |
> from portage import os |
26 |
> from portage import digraph |
27 |
> from portage._sets.base import InternalPackageSet |
28 |
> +from portage.dep import Atom |
29 |
> |
30 |
> from _emerge.BlockerCache import BlockerCache |
31 |
> from _emerge.Package import Package |
32 |
> @@ -117,7 +118,7 @@ class BlockerDB(object): |
33 |
> def discardBlocker(self, pkg): |
34 |
> """Discard a package from the list of potential |
35 |
> blockers. This will match any package(s) with identical cpv or |
36 |
> cp:slot.""" |
37 |
> - for cpv_match in |
38 |
> self._fake_vartree.dbapi.match_pkgs("=%s" % (pkg.cpv,)): |
39 |
> + for cpv_match in |
40 |
> self._fake_vartree.dbapi.match_pkgs(Atom("=%s" % (pkg.cpv,))): if |
41 |
> cpv_match.cp == pkg.cp: self._fake_vartree.cpv_discard(cpv_match) |
42 |
> for slot_match in |
43 |
> self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom): |
44 |
|
45 |
LGTM |
46 |
|
47 |
-- |
48 |
Brian Dolbec <dolsen> |