In portdbapi.aux_get(), simplify code by using string

manipulation instead of int conversion to manipulate
negative EAPI when deciding whether or not regen is
necessary.

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 824d1afc437f5201071e741223b18409074c9320..03550033ab2d09b198c3439e7db76568c5920d34 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -284,15 +284,8 @@ class portdbapi(dbapi):
                        mydata = self.auxdb[mylocation][mycpv]
                        eapi = mydata.get("EAPI","").strip()
                        if not eapi:
-                               eapi = 0
-                       try:
-                               eapi = int(eapi)
-                       except ValueError:
-                               # 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):
+                               eapi = "0"
+                       if eapi.startswith("-") and eapi_is_supported(eapi[1:]):
                                doregen = True
                        elif emtime != long(mydata.get("_mtime_", 0)):
                                doregen = True