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

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

[Zac Medico]

commit:     26ba46a9e620c5dd5d3699a854a68ab8cab04464
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: Fri Feb 25 18:08:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=26ba46a9

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

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

[Zac Medico]

commit:     23694b1dd9c6400da68ea2029e9f190994a631ac
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 19:50:52 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 19:50:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=23694b1d

dodoc: call doins, to reuse recursion code

This will fix broken recursion logic for bug #356461.

---
 bin/ebuild-helpers/4/dodoc |   51 +-------------------------------------------
 bin/ebuild-helpers/doins   |   13 ++++++++++-
 2 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
deleted file mode 100755
index 617bae2..0000000
--- a/bin/ebuild-helpers/4/dodoc
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [ $# -lt 1 ] ; then
-	die "${0##*/}: at least one argument needed"
-	exit 1
-fi
-
-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
-if [ ! -d "${dir}" ] ; then
-	install -d "${dir}"
-fi
-
-ret=0
-
-DOINSRECUR="n"
-
-if [[ "$1" == "-r" ]] ; then
-	DOINSRECUR="y"
-	shift
-fi
-
-for x in "$@" ; do
-
-	if [ -d "${x}" ] ; then
-		if [[ ${DOINSRECUR} == "n" ]] ; then
-			echo "!!! ${0##*/}: $x is a directory" 1>&2
-			((ret|=1))
-			continue
-		fi
-
-		find "${x}" -mindepth 1 -maxdepth 1 -exec \
-			env \
-				_E_DOCDESTTREE_="$(basename "${x}")" \
-				"${0}" -r {} \;
-
-	elif [ -s "${x}" ] ; then
-		install -m0644 "${x}" "${dir}" || ((ret|=1))
-	elif [ ! -e "${x}" ] ; then
-		echo "!!! ${0##*/}: $x does not exist" 1>&2
-		((ret|=1))
-	fi
-
-done
-
-[[ $ret -ne 0 ]] && die "${0##*/} failed"
-exit ${ret}

diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
new file mode 120000
index 0000000..35080ad
--- /dev/null
+++ b/bin/ebuild-helpers/4/dodoc
@@ -0,0 +1 @@
+../doins
\ No newline at end of file

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 51cac06..8055a37 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -16,6 +16,17 @@ else
 	DOINSRECUR=n
 fi
 
+if [[ ${0##*/} == dodoc ]] ; then
+	if [ $# -eq 0 ] ; then
+		# default_src_install may call dodoc with no arguments
+		# when DOC is defined but empty, so simply return
+		# sucessfully in this case.
+		exit 0
+	fi
+	export INSOPTIONS=-m0644
+	export INSDESTTREE=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
+fi
+
 if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
 	vecho "-------------------------------------------------------" 1>&2
 	vecho "You should not use \${D} with helpers." 1>&2