summaryrefslogtreecommitdiffstats
path: root/pym/portage/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/__init__.py')
-rw-r--r--pym/portage/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0abbbb81d..ed3000155 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6180,11 +6180,6 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
kmask="~"+myarch
break
- # Assume that the user doesn't want to be bothered about
- # KEYWORDS of packages that are already installed.
- if kmask and not installed:
- rValue.append(kmask+" keyword")
-
try:
missing_licenses = settings.getMissingLicenses(mycpv, metadata)
if missing_licenses:
@@ -6199,6 +6194,11 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
except portage.exception.InvalidDependString, e:
rValue.append("LICENSE: "+str(e))
+ # Only show KEYWORDS masks for installed packages
+ # if they're not masked for any other reason.
+ if kmask and (not installed or not rValue):
+ rValue.append(kmask+" keyword")
+
return rValue