[gentoo-commits] portage r9634 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 19:51:32 +0000 (Sun, 30 Mar 2008)
New Revision: 9634

Modified:
   main/trunk/bin/doins
   main/trunk/bin/newins
Log:
* Fix broken return value for doins.
* Make newins cleanup temp files after itself.


Modified: main/trunk/bin/doins
===================================================================
--- main/trunk/bin/doins	2008-03-30 19:24:11 UTC (rev 9633)
+++ main/trunk/bin/doins	2008-03-30 19:51:32 UTC (rev 9634)
@@ -28,7 +28,7 @@
 [[ ! -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 @@
 	fi
 
 	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
+	rval=$?
 	[[ -n ${cleanup} ]] && rm -f "${cleanup}"
+	return $rval
 }
 
 _xdoins() {
@@ -46,6 +48,8 @@
 	done
 }
 
+success=0
+
 for x in "$@" ; do
 	if [ -d "$x" ] ; then
 		if [ "${DOINSRECUR}" == "n" ] ; then
@@ -63,7 +67,10 @@
 		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

Modified: main/trunk/bin/newins
===================================================================
--- main/trunk/bin/newins	2008-03-30 19:24:11 UTC (rev 9633)
+++ main/trunk/bin/newins	2008-03-30 19:51:32 UTC (rev 9634)
@@ -8,6 +8,9 @@
 	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

-- 
gentoo-commits@l.g.o mailing list