diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-12-02 23:39:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-02 23:39:59 +0000 |
| commit | 0c34bd4ee8c73291605c70288ce0516ce4a3a3c7 (patch) | |
| tree | 478b882a77156f970f423b445fdbbb9810d5421b | |
| parent | 1feeb2804ba52aa215646fe07bbd19213aa424b7 (diff) | |
| download | portage-0c34bd4ee8c73291605c70288ce0516ce4a3a3c7.tar.gz portage-0c34bd4ee8c73291605c70288ce0516ce4a3a3c7.tar.bz2 portage-0c34bd4ee8c73291605c70288ce0516ce4a3a3c7.zip | |
Fix depgraph._dep_check_composite_db._visible() to reject installed packages
that are masked. This is necessary for correct choices in || deps when we
want to ensure that installed masked packages are not preferred over other
available choices that are not masked. Thanks to Jan Kundrát <jkt@g.o> for
reporting this issue and testing the patch. (trunk r12138)
svn path=/main/branches/2.1.6/; revision=12139
| -rw-r--r-- | pym/_emerge/__init__.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7f1f846da..daed4789e 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8201,13 +8201,13 @@ class depgraph(object): arg = None if arg: return False - if pkg.installed: - try: - if not visible( - self._depgraph.pkgsettings[pkg.root], pkg): - return False - except portage.exception.InvalidDependString: - pass + if pkg.installed: + try: + if not visible( + self._depgraph.pkgsettings[pkg.root], pkg): + return False + except portage.exception.InvalidDependString: + pass return True def _dep_expand(self, atom): |