From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Dec 2006 01:56:34 +0000 (-0000)
Subject: Combine two default EAPI settings in portdbapi.aux_get().
X-Git-Tag: v2.1.2~238
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c09294d1a057ee479c1900dd4e686bd8f8a43514;p=portage.git

Combine two default EAPI settings in portdbapi.aux_get().

svn path=/main/trunk/; revision=5359
---

diff --git a/pym/portage.py b/pym/portage.py
index 34fb37f63..35cdbdc6a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5376,6 +5376,9 @@ class portdbapi(dbapi):
 
 			self.auxdb[mylocation][mycpv] = mydata
 
+		if not mydata.setdefault("EAPI", "0"):
+			mydata["EAPI"] = "0"
+
 		#finally, we look at our internal cache entry and return the requested data.
 		returnme = []
 		for x in mylist:
@@ -5384,15 +5387,8 @@ class portdbapi(dbapi):
 			else:
 				returnme.append(mydata.get(x,""))
 
-		if "EAPI" in mylist:
-			idx = mylist.index("EAPI")
-			if not returnme[idx]:
-				returnme[idx] = "0"
-
 		if cache_me:
 			aux_cache = {}
-			if not mydata.setdefault("EAPI", "0"):
-				mydata["EAPI"] = "0"
 			for x in self._aux_cache_keys:
 				aux_cache[x] = mydata.get(x, "")
 			self._aux_cache[mycpv] = aux_cache