summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/dbapi/porttree.py12
1 files changed, 9 insertions, 3 deletions
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