From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Nov 2007 07:18:43 +0000 (-0000)
Subject: Fix diefunc() so that it doesn't report that the ebuild is from
X-Git-Tag: v2.1.3.19~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d75c2965c4da7cc0d95eb3816280d8beaf74602;p=portage.git

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
---

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%/*}