From c9678de7275c817ca70623bc70097db57af6a1aa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 6 Oct 2009 19:39:07 +0000 Subject: Exempt installed packages from PROPERTIES masking since the user is likely to temporarily alter ACCEPT_PROPERIES in order to avoid interactive updates and we don't want this to distort resolver choices or trigger warning messages about installed packages being masked. svn path=/main/trunk/; revision=14506 --- pym/_emerge/visible.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pym/_emerge/visible.py') diff --git a/pym/_emerge/visible.py b/pym/_emerge/visible.py index 8e9a74440..ee74910c2 100644 --- a/pym/_emerge/visible.py +++ b/pym/_emerge/visible.py @@ -27,6 +27,11 @@ def visible(pkgsettings, pkg): return False if pkgsettings._getMissingKeywords(pkg.cpv, pkg.metadata): return False + try: + if pkgsettings._getMissingProperties(pkg.cpv, pkg.metadata): + return False + except portage.exception.InvalidDependString: + return False if pkgsettings._getMaskAtom(pkg.cpv, pkg.metadata): return False if pkgsettings._getProfileMaskAtom(pkg.cpv, pkg.metadata): @@ -34,9 +39,6 @@ def visible(pkgsettings, pkg): try: if pkgsettings._getMissingLicenses(pkg.cpv, pkg.metadata): return False - if pkgsettings._getMissingProperties(pkg.cpv, pkg.metadata): - return False except portage.exception.InvalidDependString: return False return True - -- cgit v1.2.3-1-g7c22