Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9628 - main/trunk/bin
Date: Sun, 30 Mar 2008 09:17:05
Message-Id: E1Jftex-0002xW-0W@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-03-30 09:17:01 +0000 (Sun, 30 Mar 2008)
3 New Revision: 9628
4
5 Modified:
6 main/trunk/bin/doins
7 Log:
8 Make doins clean up it's own temp files. This solves an odd issue in
9 dyn_package() when portage 2.1.x is installing portage-2.2 and temp
10 python module files from doins are imported instead of the expected
11 ones.
12
13
14 Modified: main/trunk/bin/doins
15 ===================================================================
16 --- main/trunk/bin/doins 2008-03-30 07:24:05 UTC (rev 9627)
17 +++ main/trunk/bin/doins 2008-03-30 09:17:01 UTC (rev 9628)
18 @@ -28,14 +28,16 @@
19 [[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
20
21 _doins() {
22 - local mysrc="$1" mydir="$2"
23 + local mysrc="$1" mydir="$2" cleanup=""
24
25 if [ -L "$mysrc" ] ; then
26 cp "$mysrc" "${T}"
27 mysrc="${T}/${mysrc##*/}"
28 + cleanup=${mysrc}
29 fi
30
31 install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
32 + [[ -n ${cleanup} ]] && rm -f "${cleanup}"
33 }
34
35 _xdoins() {
36
37 --
38 gentoo-commits@l.g.o mailing list