diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-31 23:48:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-31 23:48:20 +0000 |
| commit | 6f822ad10103f92a8869b624e10e16cbdb103dd1 (patch) | |
| tree | abbe37e4835fa6e12ae43dd32c3d16b1008abe15 /bin | |
| parent | 61d1c4451d13c9d69b60a23a6585009db4520550 (diff) | |
| download | portage-6f822ad10103f92a8869b624e10e16cbdb103dd1.tar.gz portage-6f822ad10103f92a8869b624e10e16cbdb103dd1.tar.bz2 portage-6f822ad10103f92a8869b624e10e16cbdb103dd1.zip | |
Bug #205718 - Fix quoting of ${INSTALL_MASK} where appropriate. Thanks
to Ed Catmur <ed@catmur.co.uk> for this patch. (trunk r9256)
svn path=/main/branches/2.1.2/; revision=9257
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/misc-functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index f41ebad5a..17e51056c 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -377,7 +377,7 @@ install_mask() { rm -Rf ${root}/${no_inst} >&/dev/null # we also need to handle globs (*.a, *.h, etc) - find "${root}" -path ${no_inst} -exec rm -fR {} \; >/dev/null + find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null done # set everything back the way we found it set +o noglob @@ -414,7 +414,7 @@ preinst_mask() { fi done - install_mask "${D}" ${INSTALL_MASK} + install_mask "${D}" "${INSTALL_MASK}" # remove share dir if unnessesary if hasq nodoc $FEATURES -o hasq noman $FEATURES -o hasq noinfo $FEATURES; then @@ -525,7 +525,7 @@ preinst_selinux_labels() { dyn_package() { cd "${PORTAGE_BUILDDIR}/image" - install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK} + install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}" local pkg_dest="${PKGDIR}/All/${PF}.tbz2" local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$" local tar_options="" |