From a2e061425e9c402eb9f0101f17ce78c397f2efef Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 9 Feb 2008 06:26:39 +0000
Subject: Bug #208708 - Show informative warning messages for installed
 packages that are masked. (trunk r9301)

svn path=/main/branches/2.1.2/; revision=9302
---
 pym/portage.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pym')

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()
 
-- 
cgit v1.2.3-1-g7c22