[gentoo-commits] proj/portage:2.1.9 commit in: bin/ebuild-helpers/, bin/ebuild-helpers/4/

[Zac Medico]

commit:     31d69b9b8711dbc0f411637959d999e94dc0e02b
Author:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 07:43:17 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 20:51:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=31d69b9b

dodoc: Honour exit status of install, bug 356389.

---
 bin/ebuild-helpers/4/dodoc |    4 +++-
 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 d32343c..66a1f08 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 29b6901..67391a8 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