summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-06 19:39:07 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-06 19:39:07 +0000
commitc9678de7275c817ca70623bc70097db57af6a1aa (patch)
treeb1a80fed213346088831af896c1801c16600c211
parent747a4a37b1e7352c87b532b23acc59d5302f0dc7 (diff)
downloadportage-c9678de7275c817ca70623bc70097db57af6a1aa.tar.gz
portage-c9678de7275c817ca70623bc70097db57af6a1aa.tar.bz2
portage-c9678de7275c817ca70623bc70097db57af6a1aa.zip
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
-rw-r--r--pym/_emerge/visible.py8
1 files changed, 5 insertions, 3 deletions
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
-