diff options
| author | Brian Harring <ferringb@gentoo.org> | 2005-09-28 06:06:47 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2005-09-28 06:06:47 +0000 |
| commit | b7c3b2269acde1acf8ba3a7c1de866b8abfb1473 (patch) | |
| tree | 0e45008082f66d46c93ededf090ead9d2d843d11 | |
| parent | d3511e96ae2df2eb9a18f0603eb18c37eb2f8202 (diff) | |
| download | portage-b7c3b2269acde1acf8ba3a7c1de866b8abfb1473.tar.gz portage-b7c3b2269acde1acf8ba3a7c1de866b8abfb1473.tar.bz2 portage-b7c3b2269acde1acf8ba3a7c1de866b8abfb1473.zip | |
fixups to EAPI handling.
svn path=/main/branches/2.0/; revision=2035
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | bin/ebuild.sh | 2 | ||||
| -rw-r--r-- | pym/portage.py | 10 |
3 files changed, 8 insertions, 7 deletions
@@ -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 58713f9d2..3d1fca10d 100755 --- 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 bcaff842c..b54bb242a 100644 --- 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 |