diff options
author | 2012-07-08 20:00:13 +0100 | |
---|---|---|
committer | 2012-07-08 20:00:34 +0100 | |
commit | ccbd7c2b7cfb276c26dc3b0174f0ffaedee25529 (patch) | |
tree | a75439cde896c03c734a04ebe8917c9078990eb6 | |
parent | 557909a460a9b22d159b1a16a6baa2bcfeffaf49 (diff) | |
download | paludis-ccbd7c2b7cfb276c26dc3b0174f0ffaedee25529.tar.gz paludis-ccbd7c2b7cfb276c26dc3b0174f0ffaedee25529.tar.xz |
Fix "-r not specified" warning when hitting disallowed directory
-rwxr-xr-x | paludis/repositories/e/ebuild/utils/dohtml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/paludis/repositories/e/ebuild/utils/dohtml b/paludis/repositories/e/ebuild/utils/dohtml index 3395a83d5..e8233f7b4 100755 --- a/paludis/repositories/e/ebuild/utils/dohtml +++ b/paludis/repositories/e/ebuild/utils/dohtml @@ -106,15 +106,16 @@ install_file() { echo "install -m0644 ${path} ${dir}" install -m0644 "${path}" "${dir}/${bn}" fi - elif [[ $recurse == 1 && -d ${path} ]] && - ! has "${bn}" ${disallowed_dirs}; then - for f in ${path}/*; do - [[ -e ${f} ]] || continue - pfx=${bn} - [[ -n ${prefix} ]] && pfx="${prefix}/${pfx}" - install_file "$(basename "${f}")" "${dn}" "${pfx}" - (( ret |= $? )) - done + elif [[ $recurse == 1 && -d ${path} ]]; then + if ! has "${bn}" ${disallowed_dirs}; then + for f in ${path}/*; do + [[ -e ${f} ]] || continue + pfx=${bn} + [[ -n ${prefix} ]] && pfx="${prefix}/${pfx}" + install_file "$(basename "${f}")" "${dn}" "${pfx}" + (( ret |= $? )) + done + fi else if [[ -d "${path}" ]] ; then echo "!!! Directory '${path}' encountered, but -r not specified" |