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

diff --git a/pym/_emerge/visible.py b/pym/_emerge/visible.py
index 8e9a744401ac194e5dd18d154b815c6775e28979..ee74910c2bc617bd9a4cce0d19137b4fdaf7c0ae 100644 (file)
--- 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
-