diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-12-02 23:39:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-02 23:39:22 +0000 |
| commit | d6550d32de30c01eac956c36951090bef4ec8fd8 (patch) | |
| tree | a0f18a931a2fbca6a22a03c1e760d6549f1e658a | |
| parent | ee562f352dd15a402b5f4b713b50a0e4ea9ce438 (diff) | |
| download | portage-d6550d32de30c01eac956c36951090bef4ec8fd8.tar.gz portage-d6550d32de30c01eac956c36951090bef4ec8fd8.tar.bz2 portage-d6550d32de30c01eac956c36951090bef4ec8fd8.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.
svn path=/main/trunk/; revision=12138
| -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 194e11600..9147aa930 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8217,13 +8217,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): |