diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-14 02:45:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-14 02:45:36 +0000 |
| commit | cdbe8af09d8d3c38eb903b6703b6eb82cec9c1e4 (patch) | |
| tree | 99c67a09c761510d85843a3e53aaf250f2e20152 | |
| parent | 123e454e8fe862fd6d9e42a2f6c6451f75561ede (diff) | |
| download | portage-cdbe8af09d8d3c38eb903b6703b6eb82cec9c1e4.tar.gz portage-cdbe8af09d8d3c38eb903b6703b6eb82cec9c1e4.tar.bz2 portage-cdbe8af09d8d3c38eb903b6703b6eb82cec9c1e4.zip | |
Always `unset DEPEND RDEPEND PDEPEND IUSE` prior to sourcing the ebuild in order to ensure correct interaction during the process of sourcing. Thanks to exg for reporting this issue.
svn path=/main/trunk/; revision=4677
| -rwxr-xr-x | bin/ebuild.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b43485130..e3935e593 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1453,6 +1453,11 @@ fi # this can be left out of ebd variants, since they're unaffected. unset EBUILD_DEATH_HOOKS +# *DEPEND and IUSE will be set during the sourcing of the ebuild. In order to +# ensure correct interaction between ebuilds and eclasses, they need to be +# unset before this process of interaction begins. +unset DEPEND RDEPEND PDEPEND IUSE + source ${EBUILD} || die "error sourcing ebuild" if ! hasq depend $EBUILD_PHASE; then RESTRICT="${PORTAGE_RESTRICT}" |