From bdb9600295662f022e3b2c147abad3c945c517f6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Dec 2006 01:54:42 +0000
Subject: For bug #158632, make aux_get caching safe for missing values in
 cache entries.

svn path=/main/trunk/; revision=5342
---
 pym/portage.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pym/portage.py')

diff --git a/pym/portage.py b/pym/portage.py
index 40cb23246..22479c1f9 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5422,10 +5422,11 @@ class portdbapi(dbapi):
 
 		if cache_me:
 			aux_cache = {}
+			mydata.setdefault("EAPI", "0")
+			if not mydata["EAPI"]:
+				mydata["EAPI"] = "0"
 			for x in self._aux_cache_keys:
-				aux_cache[x] = mydata[x]
-			if not aux_cache["EAPI"]:
-				aux_cache["EAPI"] = "0"
+				aux_cache[x] = mydata.get(x, "")
 			self._aux_cache[mycpv] = aux_cache
 
 		return returnme
-- 
cgit v1.2.3-1-g7c22