diff options
author | Ulrich Mueller <ulm@gentoo.org> | 2011-02-25 08:43:17 +0100 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-03-01 12:51:31 -0800 |
commit | 31d69b9b8711dbc0f411637959d999e94dc0e02b (patch) | |
tree | 6524424ed6807b9994ae3ef29bb9e8c0d03dbeee | |
parent | fe71c29eb3c0bd67886482c3cd394945e0b373e9 (diff) | |
download | portage-31d69b9b8711dbc0f411637959d999e94dc0e02b.tar.gz portage-31d69b9b8711dbc0f411637959d999e94dc0e02b.tar.bz2 portage-31d69b9b8711dbc0f411637959d999e94dc0e02b.zip |
dodoc: Honour exit status of install, bug 356389.
-rwxr-xr-x | bin/ebuild-helpers/4/dodoc | 4 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dodoc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc index d32343c71..66a1f088b 100755 --- a/bin/ebuild-helpers/4/dodoc +++ b/bin/ebuild-helpers/4/dodoc @@ -27,6 +27,8 @@ for x in "$@" ; do if [ -d "${x}" ] ; then if [[ ${DOINSRECUR} == "n" ]] ; then + echo "!!! ${0##*/}: $x is a directory" 1>&2 + ((ret|=1)) continue fi @@ -36,7 +38,7 @@ for x in "$@" ; do ${0} -r {} \; elif [ -s "${x}" ] ; then - install -m0644 "${x}" "${dir}" + install -m0644 "${x}" "${dir}" || ((ret|=1)) elif [ ! -e "${x}" ] ; then echo "!!! ${0##*/}: $x does not exist" 1>&2 ((ret|=1)) diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc index 29b690112..67391a855 100755 --- a/bin/ebuild-helpers/dodoc +++ b/bin/ebuild-helpers/dodoc @@ -16,8 +16,10 @@ fi ret=0 for x in "$@" ; do - if [ -s "${x}" ] ; then - install -m0644 "${x}" "${dir}" + if [ -d "${x}" ] ; then + eqawarn "QA Notice: dodoc argument '${x}' is a directory" + elif [ -s "${x}" ] ; then + install -m0644 "${x}" "${dir}" || { ((ret|=1)); continue; } ecompress --queue "${dir}/${x##*/}" elif [ ! -e "${x}" ] ; then echo "!!! ${0##*/}: $x does not exist" 1>&2 |