From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 4 Oct 2007 02:33:53 +0000 (-0000)
Subject: Non-integer EAPI isn't supported. In case it's supported in
X-Git-Tag: v2.2_pre1~734
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64ac544bc2077d17866a53b0acbc8babf462cbcf;p=portage.git

Non-integer EAPI isn't supported. In case it's supported in
the future, assume that it's valid (rather than trigger a
regen).

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 71b2a2a2c..83c568fa0 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -282,11 +282,17 @@ class portdbapi(dbapi):
 
 		try:
 			mydata = self.auxdb[mylocation][mycpv]
+			eapi = mydata.get("EAPI","").strip()
+			if not eapi:
+				eapi = 0
 			try:
-				eapi = int(mydata.get("EAPI", 0))
+				eapi = int(eapi)
 			except ValueError:
-				raise KeyError()
-			if eapi < 0 and eapi_is_supported(-eapi):
+				# Non-integer EAPI isn't supported. In case it's supported in
+				# the future, assume that it's valid (rather than trigger a
+				# regen).
+				eapi = None
+			if eapi is not None and eapi < 0 and eapi_is_supported(-eapi):
 				doregen = True
 			elif emtime != long(mydata.get("_mtime_", 0)):
 				doregen = True