From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-52755-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Jftez-0006gi-HK
	for garchives@archives.gentoo.org; Sun, 30 Mar 2008 09:17:05 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A2DB4E0572;
	Sun, 30 Mar 2008 09:17:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 7F43AE0572
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Mar 2008 09:17:04 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 2EB5C66BB1
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Mar 2008 09:17:04 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.68)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1Jftex-0002xW-0W
	for gentoo-commits@lists.gentoo.org; Sun, 30 Mar 2008 09:17:03 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r9628 - main/trunk/bin
X-VCS-Repository: portage
X-VCS-Revision: 9628
X-VCS-Files: main/trunk/bin/doins
X-VCS-Directories: main/trunk/bin
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1Jftex-0002xW-0W@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Sun, 30 Mar 2008 09:17:03 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: d0729353-10ea-4f10-8322-971996bda04f
X-Archives-Hash: 2f8c3d0d9ba9a54efdb559068560313b

Author: zmedico
Date: 2008-03-30 09:17:01 +0000 (Sun, 30 Mar 2008)
New Revision: 9628

Modified:
   main/trunk/bin/doins
Log:
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.


Modified: main/trunk/bin/doins
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/bin/doins	2008-03-30 07:24:05 UTC (rev 9627)
+++ main/trunk/bin/doins	2008-03-30 09:17:01 UTC (rev 9628)
@@ -28,14 +28,16 @@
 [[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
=20
 _doins() {
-	local mysrc=3D"$1" mydir=3D"$2"
+	local mysrc=3D"$1" mydir=3D"$2" cleanup=3D""
=20
 	if [ -L "$mysrc" ] ; then
 		cp "$mysrc" "${T}"
 		mysrc=3D"${T}/${mysrc##*/}"
+		cleanup=3D${mysrc}
 	fi
=20
 	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
+	[[ -n ${cleanup} ]] && rm -f "${cleanup}"
 }
=20
 _xdoins() {

--=20
gentoo-commits@lists.gentoo.org mailing list