From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 09:18:34 +0000 (-0000)
Subject: Make doins clean up it's own temp files. This solves an odd issue in
X-Git-Tag: v2.1.5~283
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff40fed29299cbc72aa51c76e304bb7f9ea26a13;p=portage.git

Make doins clean up it's own temp files. This solves an odd issue in
dyn_package() when portage 2.1.x is installing portage-2.2 and temp
python module files from doins are imported instead of the expected
ones. (trunk r9628)

svn path=/main/branches/2.1.2/; revision=9629
---

diff --git a/bin/doins b/bin/doins
index a4f5ee22f..945938c8b 100755
--- a/bin/doins
+++ b/bin/doins
@@ -28,14 +28,16 @@ fi
 [[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
 
 _doins() {
-	local mysrc="$1" mydir="$2"
+	local mysrc="$1" mydir="$2" cleanup=""
 
 	if [ -L "$mysrc" ] ; then
 		cp "$mysrc" "${T}"
 		mysrc="${T}/${mysrc##*/}"
+		cleanup=${mysrc}
 	fi
 
 	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
+	[[ -n ${cleanup} ]] && rm -f "${cleanup}"
 }
 
 _xdoins() {