[PC-BSD Commits] r19658 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2012-10-13 12:30:03 +0000 (Sat, 13 Oct 2012)
New Revision: 19658

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Fix false positives on PBI builds



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-13 09:19:03 UTC (rev 19657)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-13 12:30:03 UTC (rev 19658)
@@ -5914,7 +5914,7 @@
 	_cd="`cat ${PBI_TMPDIR}/${build}.cd`"
 	sleep 1
 
-	if [ -e "${PBI_TMPDIR}/${build}.result" ] ; then
+	if [ -e "${PBI_TMPDIR}/${build}.result" -a "`cat ${PBI_TMPDIR}/${build}.result`" = "0" ] ; then
 		echo "$PBI_PROGVERSION" > "${_od}/pbi-version"
 		echo "OK" > "${_od}/pbi-result"
 
@@ -5982,7 +5982,7 @@
 		# Make sure we don't try to make a patch of identical files
 	  	if [ "`basename $_oPBI`" != "`basename $_curPBI`" ] ; then	
 			#echo "Building pbp patch of ${_oPBI} -> ${_curPBI}"
-			pbi_makepatch $_mpflags "$_oPBI" "$_curPBI" 2>/dev/null
+			pbi_makepatch $_mpflags "$_oPBI" "$_curPBI" >/dev/null 2>/dev/null
 			if [ "$?" != "0" ] ; then
 				echo "pbi_makepatch: Failed creating patchfile for $_oPBI -> $_curPBI"
 			fi