summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 09:17:01 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 09:17:01 +0000
commita096da4db6b7e768900a39e60d74ad43f74f0c42 (patch)
tree87671ae39b7f8f24b210425d4aca1a9b62dcad64
parentb478f07cfe7564290f33df1ec20dd6c77707c17d (diff)
downloadportage-a096da4db6b7e768900a39e60d74ad43f74f0c42.tar.gz
portage-a096da4db6b7e768900a39e60d74ad43f74f0c42.tar.bz2
portage-a096da4db6b7e768900a39e60d74ad43f74f0c42.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. svn path=/main/trunk/; revision=9628
-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() {