commit: 298caad4eed4c6025776fd84b0cda9ef6c59119c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 19:30:25 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:30:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=298caad4
_get_masking_status: avoid Prefix checks when not in use
Also, fix deprecation warnings for _emerge.Package.Package.metadata
pym/_emerge/depgraph.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 813e345e0..f7bac69f9 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -10042,11 +10042,15 @@ def _get_masking_status(pkg, pkgsettings,
root_config, myrepo=None, use=None):
mreasons.append(_MaskReason("CHOST", "CHOST: %s" % \
pkg._metadata["CHOST"]))
- if pkg.built and not pkg.installed:
- if not "EPREFIX" in pkg.metadata:
- mreasons.append(_MaskReason("EPREFIX", "missing
EPREFIX"))
- elif len(pkg.metadata["EPREFIX"].strip()) <
len(pkgsettings["EPREFIX"]):
- mreasons.append(_MaskReason("EPREFIX", "EPREFIX: '%s'
too small" % pkg.metadata["EPREFIX"]))
+ eprefix = pkgsettings["EPREFIX"]
+ if len(eprefix.rstrip('/')) > 0 and pkg.built and not pkg.installed:
+ if not "EPREFIX" in pkg._metadata:
+ mreasons.append(_MaskReason("EPREFIX",
+ "missing EPREFIX"))
+ elif len(pkg._metadata["EPREFIX"].strip()) < len(eprefix):
+ mreasons.append(_MaskReason("EPREFIX",
+ "EPREFIX: '%s' too small" % \
+ pkg._metadata["EPREFIX"]))
if pkg.invalid:
for msgs in pkg.invalid.values():
