Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10212 - main/trunk/bin
Date: Mon, 05 May 2008 21:50:11
Message-Id: E1Jt8ZV-0008Fl-1i@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-05 21:50:08 +0000 (Mon, 05 May 2008)
3 New Revision: 10212
4
5 Modified:
6 main/trunk/bin/misc-functions.sh
7 Log:
8 Use find -path -or -name to match basenames of files in INSTALL_MASK
9 as suggested by solar in bug #219286, comment #8.
10
11
12 Modified: main/trunk/bin/misc-functions.sh
13 ===================================================================
14 --- main/trunk/bin/misc-functions.sh 2008-05-05 21:07:53 UTC (rev 10211)
15 +++ main/trunk/bin/misc-functions.sh 2008-05-05 21:50:08 UTC (rev 10212)
16 @@ -413,7 +413,8 @@
17 rm -Rf "${root}"/${no_inst} >&/dev/null
18
19 # we also need to handle globs (*.a, *.h, etc)
20 - find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null
21 + find "${root}" \( -path "${no_inst}" -or -name "${no_inst}" \) \
22 + -exec rm -fR {} \; >/dev/null
23 done
24 # set everything back the way we found it
25 set +o noglob
26
27 --
28 gentoo-commits@l.g.o mailing list