diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-02 07:18:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-02 07:18:43 +0000 |
| commit | 0d75c2965c4da7cc0d95eb3816280d8beaf74602 (patch) | |
| tree | a58e81c8d853238e1bd2fe7813568bead3761ba6 /bin/ebuild.sh | |
| parent | df90926da388c9e2bb467874873d5905cb696976 (diff) | |
| download | portage-0d75c2965c4da7cc0d95eb3816280d8beaf74602.tar.gz portage-0d75c2965c4da7cc0d95eb3816280d8beaf74602.tar.bz2 portage-0d75c2965c4da7cc0d95eb3816280d8beaf74602.zip | |
Fix diefunc() so that it doesn't report that the ebuild is from
an overlay when EMERGE_FROM == binary. (trunk r8349)
svn path=/main/branches/2.1.2/; revision=8375
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index c434c9ba2..df3078f77 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -333,7 +333,8 @@ diefunc() { eerror " ${x}" done fi - if [[ "${EBUILD#${PORTDIR}/}" == "${EBUILD}" ]] ; then + if [ "${EMERGE_FROM}" != "binary" ] && \ + [ "${EBUILD#${PORTDIR}/}" == "${EBUILD}" ] ; then local overlay=${EBUILD%/*} overlay=${overlay%/*} overlay=${overlay%/*} |