diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-02 19:24:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-02 19:24:44 +0000 |
| commit | f256c18f010f075803753c440eff05c9d0ad5258 (patch) | |
| tree | 1c8d0bd7d8c33403abf27e6b953ceb21997e2e58 | |
| parent | Bug #285191 - Remove the RDEPEND.implicit check because it is invalid. (diff) | |
| download | portage-f256c18f010f075803753c440eff05c9d0ad5258.tar.gz portage-f256c18f010f075803753c440eff05c9d0ad5258.tar.bz2 portage-f256c18f010f075803753c440eff05c9d0ad5258.zip | |
Bug #287333 - Fix the code from bug #252167 so it behaves consistently
regardless of the package (ebuild or binpkg) being masked.
svn path=/main/trunk/; revision=14472
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9b4c0b6dd..2d47fd467 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2304,8 +2304,7 @@ class depgraph(object): reinstall_for_flags = None if not pkg.installed or \ - (pkg.built and matched_packages and \ - not (avoid_update and pkg.installed)): + (matched_packages and not avoid_update): # Only enforce visibility on installed packages # if there is at least one other visible package # available. By filtering installed masked packages @@ -2323,8 +2322,8 @@ class depgraph(object): # with visible KEYWORDS when the installed # version is masked by KEYWORDS, but never # reinstall the same exact version only due - # to a KEYWORDS mask. - if built and matched_packages: + # to a KEYWORDS mask. See bug #252167. + if matched_packages: different_version = None for avail_pkg in matched_packages: |