fixups to EAPI handling.

svn path=/main/branches/2.0/; revision=2035

diff --git a/ChangeLog b/ChangeLog
index e6a34380f665ea3d4c2b7c6fb601d71d1b3d4c22..b5b28b258231e2f84af25a674c671d47793cbaa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,8 @@
   No more portageq in the global scope.
   Instant die.
 
-  27 Sep 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild.sh:
+  27 Sep 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild.sh, 
+  pym/portage.py:
   Tweak to make EAPI work for existing vdb entries.
 
   24 Sep 2005; Brian Harring <ferringb@gentoo.org> pym/portage.py, 

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 58713f9d2d3b6e79145e13f1e852cc4276fbdda5..3d1fca10de027bb253797fee6e7b6b9661e4d184 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -924,7 +924,7 @@ dyn_compile() {
        echo "$RESTRICT"       > RESTRICT
        echo "$SLOT"           > SLOT
        echo "$USE"            > USE
-       echo "$EAPI"               > EAPI
+       echo "${EAPI:-0}"          > EAPI
 
        set                                         >  environment
        export -p | sed 's:declare -rx:declare -x:' >> environment

diff --git a/pym/portage.py b/pym/portage.py
index bcaff842cf1e6bc3daf17271900acd63a092d72a..b54bb242ae03d082a3bf40d07cd3d6a759b8f1cf 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4552,7 +4552,7 @@ class bindbapi(fakedbapi):
                                mylist.append(myval)
                if "EAPI" in wants:
                        idx = wants.index("EAPI")
-                       if mylist[idx] in ("", "0"):
+                       if mylist[idx] in ("", "0", None):
                                mylist[idx] = 0
                        elif mylist[idx] == 0:
                                pass
@@ -4839,12 +4839,12 @@ class vardbapi(dbapi):
                        results.append(myd)
                if "EAPI" in wants:
                        idx = wants.index("EAPI")
-                       if mylist[idx] in ("", "0"):
-                               mylist[idx] = 0
-                       elif mylist[idx] == 0:
+                       if results[idx] in ("", "0", None):
+                               results[idx] = 0
+                       elif results[idx] == 0:
                                pass
                        else:
-                               mylist[idx] = 1
+                               results[idx] = 1
                return results