From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 8 May 2006 17:55:58 +0000 (-0000)
Subject: Give a less confusing error message when unpack() arguments begin with ${DISTDIR... 
X-Git-Tag: v2.1_rc1~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80f33830278ab14b1505df9974488d81d363529e;p=portage.git

Give a less confusing error message when unpack() arguments begin with ${DISTDIR}.  Thanks to Flameeyes for reporting.

svn path=/main/trunk/; revision=3333
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 70fffc1ba..b3f34d6ea 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -365,6 +365,8 @@ unpack() {
 		else
 			srcdir="${DISTDIR}/"
 		fi
+		[ "${x}" != "${x/${DISTDIR}}" ] && \
+			die "Arguments to unpack() should not begin with \${DISTDIR}."
 		[ ! -s "${srcdir}${x}" ] && die "$myfail"
 
 		myfail="failure unpacking ${x}"