From 10e7d8a6b3cd52d0e6b73c65451cd975040942a5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 2 Jan 2011 02:01:43 -0800 Subject: depgraph: use Package.masks for installed In some cases we do special masking checks for installed packages, and Package.masks is a convenient way to do it. --- pym/_emerge/depgraph.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 71d6746a0..d570b28fe 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2581,8 +2581,8 @@ class depgraph(object): pkg, existing = ret if pkg is not None: settings = pkg.root_config.settings - if self._pkg_visibility_check(pkg) and not (pkg.installed and \ - settings._getMissingKeywords(pkg.cpv, pkg.metadata)): + if self._pkg_visibility_check(pkg) and \ + not (pkg.installed and pkg.masks): self._dynamic_config._visible_pkgs[pkg.root].cpv_inject(pkg) return ret @@ -2903,9 +2903,7 @@ class depgraph(object): # If --usepkgonly is enabled, assume that # the ebuild status should be ignored. if not use_ebuild_visibility and usepkgonly: - if installed and \ - pkgsettings._getMissingKeywords( - pkg.cpv, pkg.metadata): + if pkg.installed and pkg.masks: continue else: try: -- cgit v1.2.3-1-g7c22