From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 26 Jan 2011 20:02:39 +0000 (+0100)
Subject: doins: put EPREFIX check next to ED check
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63afaeb40fec3d41f9118905cf542f87abe81ee9;p=portage.git

doins: put EPREFIX check next to ED check

for clarity, but also to avoid leaving behind stuff when calling with
EPREFIX
---

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index dd2bee954..882e19c63 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -24,6 +24,13 @@ if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
 	helpers_die "${0##*/} used with \${D}"
 	exit 1
 fi
+if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
+	vecho "-------------------------------------------------------" 1>&2
+	vecho "You should not use \${EPREFIX} with helpers." 1>&2
+	vecho "  --> ${INSDESTTREE}" 1>&2
+	vecho "-------------------------------------------------------" 1>&2
+	exit 1
+fi
 
 case "$EAPI" in
 	0|1|2|3|3_pre2)
@@ -38,14 +45,6 @@ export TMP=$T/.doins_tmp
 # Use separate directories to avoid potential name collisions.
 mkdir -p "$TMP"/{1,2}
 
-if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
-	vecho "-------------------------------------------------------" 1>&2
-	vecho "You should not use \${EPREFIX} with helpers." 1>&2
-	vecho "  --> ${INSDESTTREE}" 1>&2
-	vecho "-------------------------------------------------------" 1>&2
-	exit 1
-fi
-
 [[ ! -d ${ED}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
 
 _doins() {