diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-31 23:45:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-31 23:45:12 +0000 |
| commit | e462dd11429d1e1453504b24e44583c7f50bf9c1 (patch) | |
| tree | 75d35289e7c64618529024845c0039322216e809 | |
| parent | fad4dcf8e04900bf7f2bb008b39dcdfb9b64e66e (diff) | |
| download | portage-e462dd11429d1e1453504b24e44583c7f50bf9c1.tar.gz portage-e462dd11429d1e1453504b24e44583c7f50bf9c1.tar.bz2 portage-e462dd11429d1e1453504b24e44583c7f50bf9c1.zip | |
Bug #205718 - Fix quoting of ${INSTALL_MASK} where appropriate. Thanks
to Ed Catmur <ed@catmur.co.uk> for this patch.
svn path=/main/trunk/; revision=9256
| -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 ca2459725..7857ef28a 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -384,7 +384,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 @@ -421,7 +421,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 @@ -532,7 +532,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 tar_options="" [ "${PORTAGE_QUIET}" == "1" ] || tar_options="${tar_options} -v" # Sandbox is disabled in case the user wants to use a symlink |