From: Ulrich Mueller <ulm@gentoo.org>
Date: Fri, 25 Feb 2011 07:43:17 +0000 (+0100)
Subject: dodoc: Honour exit status of install, bug 356389.
X-Git-Tag: v2.1.9.42~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31d69b9b8711dbc0f411637959d999e94dc0e02b;p=portage.git

dodoc: Honour exit status of install, bug 356389.
---

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