From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 19:51:53 +0000 (-0000)
Subject: * Fix broken return value for doins.
X-Git-Tag: v2.1.5~280
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26e962f5125940b296016f22901b608a5c49a6e2;p=portage.git

* Fix broken return value for doins.
* Make newins cleanup temp files after itself.
(trunk r9634)

svn path=/main/branches/2.1.2/; revision=9635
---

diff --git a/bin/doins b/bin/doins
index 945938c8b..57a21c4bb 100755
--- a/bin/doins
+++ b/bin/doins
@@ -28,7 +28,7 @@ fi
 [[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
 
 _doins() {
-	local mysrc="$1" mydir="$2" cleanup=""
+	local mysrc="$1" mydir="$2" cleanup="" rval
 
 	if [ -L "$mysrc" ] ; then
 		cp "$mysrc" "${T}"
@@ -37,7 +37,9 @@ _doins() {
 	fi
 
 	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
+	rval=$?
 	[[ -n ${cleanup} ]] && rm -f "${cleanup}"
+	return $rval
 }
 
 _xdoins() {
@@ -46,6 +48,8 @@ _xdoins() {
 	done
 }
 
+success=0
+
 for x in "$@" ; do
 	if [ -d "$x" ] ; then
 		if [ "${DOINSRECUR}" == "n" ] ; then
@@ -63,7 +67,10 @@ for x in "$@" ; do
 		find "${x##*/}" -type d -exec dodir "${INSDESTTREE}/{}" \;
 		find "${x##*/}" \( -type f -or -type l \) -print0 | _xdoins
 		popd >/dev/null
+		((++success))
 	else
-		_doins "${x}"
+		_doins "${x}" && ((++success))
 	fi
 done
+
+[ $success -gt 0 ] && exit 0 || exit 1
diff --git a/bin/newins b/bin/newins
index c64e06600..7735fc33c 100755
--- a/bin/newins
+++ b/bin/newins
@@ -8,6 +8,9 @@ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doins "${T}/${2}"
+rm -rf "${T}/${2}" || exit $?
+cp -f "${1}" "${T}/${2}" || exit $?
+doins "${T}/${2}"
+ret=$?
+rm -rf "${T}/${2}"
+exit $ret