summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-02-09 06:26:39 +0000
committerZac Medico <zmedico@gentoo.org>2008-02-09 06:26:39 +0000
commita2e061425e9c402eb9f0101f17ce78c397f2efef (patch)
tree21f1db21ef746d56f25bb1faece8d1770e0b4c03 /pym
parent1e7ce00c4bbeb1a1df6818f41953f7a0f2ffa8ab (diff)
downloadportage-a2e061425e9c402eb9f0101f17ce78c397f2efef.tar.gz
portage-a2e061425e9c402eb9f0101f17ce78c397f2efef.tar.bz2
portage-a2e061425e9c402eb9f0101f17ce78c397f2efef.zip
Bug #208708 - Show informative warning messages for installed
packages that are masked. (trunk r9301) svn path=/main/branches/2.1.2/; revision=9302
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 43dc6704e..e27e30a3d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1877,7 +1877,11 @@ class config:
pkginternaluse = ""
iuse = ""
if mydb:
- slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"])
+ if isinstance(mydb, dict):
+ slot = mydb["SLOT"]
+ iuse = mydb["IUSE"]
+ else:
+ slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"])
cpv_slot = "%s:%s" % (self.mycpv, slot)
pkginternaluse = []
for x in iuse.split():
@@ -6891,7 +6895,8 @@ class portdbapi(dbapi):
self.auxdb[x] = self.auxdbmodule(
self.depcachedir, x, filtered_auxdbkeys, gid=portage_gid)
# Selectively cache metadata in order to optimize dep matching.
- self._aux_cache_keys = set(["EAPI", "KEYWORDS", "SLOT"])
+ self._aux_cache_keys = set(
+ ["EAPI", "IUSE", "KEYWORDS", "LICENSE", "PROVIDE", "SLOT"])
self._aux_cache = {}
self._broken_ebuilds = set()