summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-09 05:56:42 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-09 05:56:42 -0700
commitc067704f25f8ef74e53d16a333067767b69e06dd (patch)
tree551fa888f29ed65a1b53e649c3510b029d7f8d2d
parent29b8ad2f115bdb146ecc2ed932e4af5f1bb955ff (diff)
downloadportage-c067704f25f8ef74e53d16a333067767b69e06dd.tar.gz
portage-c067704f25f8ef74e53d16a333067767b69e06dd.tar.bz2
portage-c067704f25f8ef74e53d16a333067767b69e06dd.zip
_show_unsatisfied_dep: fix logic for EAPI mask
This will fix bug #370465.
-rw-r--r--pym/_emerge/depgraph.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 074e28769..413e06719 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2804,8 +2804,8 @@ class depgraph(object):
metadata, mreasons = get_mask_info(root_config, cpv, pkgsettings, db, pkg_type, \
built, installed, db_keys, myrepo=repo, _pkg_use_enabled=self._pkg_use_enabled)
-
- if metadata is not None:
+ if metadata is not None and \
+ portage.eapi_is_supported(metadata["EAPI"]):
if not repo:
repo = metadata.get('repository')
pkg = self._pkg(cpv, pkg_type, root_config,
@@ -6875,8 +6875,13 @@ def show_masked_packages(masked_packages):
if output_cpv in shown_cpvs:
continue
shown_cpvs.add(output_cpv)
+ eapi_masked = metadata is not None and \
+ not portage.eapi_is_supported(metadata["EAPI"])
+ if eapi_masked:
+ have_eapi_mask = True
comment, filename = None, None
- if "package.mask" in mreasons:
+ if not eapi_masked and \
+ "package.mask" in mreasons:
comment, filename = \
portage.getmaskingreason(
cpv, metadata=metadata,
@@ -6884,9 +6889,7 @@ def show_masked_packages(masked_packages):
portdb=root_config.trees["porttree"].dbapi,
return_location=True)
missing_licenses = []
- if metadata:
- if not portage.eapi_is_supported(metadata["EAPI"]):
- have_eapi_mask = True
+ if not eapi_masked and metadata is not None:
try:
missing_licenses = \
pkgsettings._getMissingLicenses(