summaryrefslogtreecommitdiffstats
path: root/bin/doins
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 09:18:34 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 09:18:34 +0000
commitff40fed29299cbc72aa51c76e304bb7f9ea26a13 (patch)
treee62b7bdcfd36f26fda6d15ab468552303e3a00e1 /bin/doins
parente904128c19893ad01560a6906620adfb4b4ad8ad (diff)
downloadportage-ff40fed29299cbc72aa51c76e304bb7f9ea26a13.tar.gz
portage-ff40fed29299cbc72aa51c76e304bb7f9ea26a13.tar.bz2
portage-ff40fed29299cbc72aa51c76e304bb7f9ea26a13.zip
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
Diffstat (limited to 'bin/doins')
-rwxr-xr-xbin/doins4
1 files changed, 3 insertions, 1 deletions
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() {