diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-15 04:38:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-15 04:38:15 +0000 |
| commit | 4e140ed13ad3edb75a8e6e00990498caaf0aa5b2 (patch) | |
| tree | f00effbf83ad025a5f73f451dcfbd8436e61b817 /pym/_emerge | |
| parent | 1947be0908f43bb644df6439e94e8aa0afbf19ee (diff) | |
| download | portage-4e140ed13ad3edb75a8e6e00990498caaf0aa5b2.tar.gz portage-4e140ed13ad3edb75a8e6e00990498caaf0aa5b2.tar.bz2 portage-4e140ed13ad3edb75a8e6e00990498caaf0aa5b2.zip | |
Add support for and ACCEPT_CHOSTS variable that controls masking behavior
for binary packages wrt CHOST. The variable is a space separated list of
chosts. It support regular expressions, so if the actual chost contains
any special characters then the user must escape them when setting
ACCEPT_CHOSTS.
svn path=/main/trunk/; revision=10654
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 97bd9604c..fef25c3f0 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1114,9 +1114,8 @@ def visible(pkgsettings, pkg): """ if not pkg.metadata["SLOT"]: return False - if pkg.built and not pkg.installed: - pkg_chost = pkg.metadata.get("CHOST") - if pkg_chost and pkg_chost != pkgsettings["CHOST"]: + if pkg.built and not pkg.installed and "CHOST" in pkg.metadata: + if not pkgsettings._accept_chost(pkg): return False if not portage.eapi_is_supported(pkg.metadata["EAPI"]): return False @@ -1140,9 +1139,8 @@ def get_masking_status(pkg, pkgsettings, root_config): pkg, settings=pkgsettings, portdb=root_config.trees["porttree"].dbapi) - if pkg.built and not pkg.installed: - pkg_chost = pkg.metadata.get("CHOST") - if pkg_chost and pkg_chost != pkgsettings["CHOST"]: + if pkg.built and not pkg.installed and "CHOST" in pkg.metadata: + if not pkgsettings._accept_chost(pkg): mreasons.append("CHOST: %s" % \ pkg.metadata["CHOST"]) |