diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-10 23:39:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-10 23:39:16 +0000 |
| commit | e559940e19ac2d32109df4b275ea9744e57171e9 (patch) | |
| tree | 005c573f3eca39dc1cb129f8888a00f99f72837f /pym | |
| parent | 01dd4040e25e5554184af5c3068e6af5256ea964 (diff) | |
| download | portage-e559940e19ac2d32109df4b275ea9744e57171e9.tar.gz portage-e559940e19ac2d32109df4b275ea9744e57171e9.tar.bz2 portage-e559940e19ac2d32109df4b275ea9744e57171e9.zip | |
Bug #209538 - Disable annoying "masked by keyword" warnings for installed
packages. We can assume that if the user accepted the keywords at merge
time then they never want to be bothered again. (trunk r9330)
svn path=/main/branches/2.1.2/; revision=9331
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index e27e30a3d..b63105cac 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5665,11 +5665,21 @@ def getmaskingreason(mycpv, metadata=None, settings=None, portdb=None, return_lo else: return None -def getmaskingstatus(mycpv, metadata=None, settings=None, portdb=None): +def getmaskingstatus(mycpv, settings=None, portdb=None): if settings is None: settings = config(clone=globals()["settings"]) if portdb is None: portdb = globals()["portdb"] + + metadata = None + installed = False + if not isinstance(mycpv, basestring): + # emerge passed in a Package instance + pkg = mycpv + mycpv = pkg.cpv + metadata = pkg.metadata + installed = pkg.installed + mysplit = catpkgsplit(mycpv) if not mysplit: raise ValueError("invalid CPV: %s" % mycpv) @@ -5750,7 +5760,9 @@ def getmaskingstatus(mycpv, metadata=None, settings=None, portdb=None): kmask="~"+myarch break - if kmask: + # 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") return rValue |