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

svn at pcbsd.org svn at pcbsd.org
Wed Aug 1 10:15:35 PDT 2012


Author: kris
Date: 2012-08-01 17:15:35 +0000 (Wed, 01 Aug 2012)
New Revision: 18067

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

Don't skip any ports to check for rebuilding



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 17:12:44 UTC (rev 18066)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 17:15:35 UTC (rev 18067)
@@ -5476,9 +5476,6 @@
 		unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION
 		. ${pbi}
 
-		# If we have a PBI already and this one has no version we can continue
-	        if [ -z "${PBI_AB_PRIORITY}" -a -n "${CUR_WORKING_PBI}"  ] ; then continue ; fi
-
 		_cd=$(dirname $pbi | sed 's|./||')
 		PBI_CONFDIR="$_cd"
 
@@ -5496,7 +5493,7 @@
 		# Check if this port can be built on this architecture
 		check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}"
 		if [ "$?" = "1" ] ; then
-			#echo "Incompatiable port arch: ${PORTSDIR}/${PBI_MAKEPORT}"
+			echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
 			continue
 		fi
 		
@@ -6139,7 +6136,7 @@
 	# Make sure this PBI hasn't already failed during this run
 	if [ -e "${PBI_AB_OUTDIR}/${_cd}/.abkey" ] ; then
 	  if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/.abkey`" = "$_abkey" ] ; then
-            echo "Skipping port failed during this run: $_port"
+            echo "$_port - Skipping failed from this run"
 	    return 1
   	  fi
 	fi
@@ -6151,7 +6148,7 @@
 		_fcsum="`cat ${PBI_AB_OUTDIR}/${_cd}/.failed-csum`"
 		_ncsum="`tar cvf - -C "${PORTSDIR}/${_port}" . 2>/dev/null | md5 -q`"
 		if [ "$_fcsum" != "$_ncsum" ] ; then
-            		echo "Skipping failed: $_port"
+            		echo "$_port - Skipping failed"
 			return 1
 		fi
  	fi	



More information about the Commits mailing list