For bug #158632, make aux_get caching safe for missing values in cache entries.

svn path=/main/trunk/; revision=5342

diff --git a/pym/portage.py b/pym/portage.py
index 40cb232465ccba7b60827a4808d2dc9a6622980d..22479c1f9747c3f94ede189a3569238b788514e8 100644 (file)
--- 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