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

[svn at pcbsd.org]

Author: kris
Date: 2011-09-30 20:15:50 -0700 (Fri, 30 Sep 2011)
New Revision: 13058

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

Add extra check for badly formed module missing PBI_MAKEPORT



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-10-01 03:02:35 UTC (rev 13057)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-10-01 03:15:50 UTC (rev 13058)
@@ -1429,6 +1429,9 @@
 
 	if [ -z "${PBI_PROGVERSION}" ] ; then
 		load_pbi_conffile
+
+		# If we have PBI_PROGVERSION now set
+		if [ ! -z "${PBI_PROGVERSION}" ] ; then return 0 ; fi
 	else
 		return 0
 	fi
@@ -5235,6 +5238,12 @@
 			#echo "Incompatiable port arch: ${PORTSDIR}/${PBI_MAKEPORT}"
 			continue
 		fi
+		
+		# Check for missing port target
+		if [ -z "$PBI_MAKEPORT" ] ; then
+			echo "Warning: Missing PBI_MAKEPORT for ${pbi}"
+			continue
+		fi
 
 		check_ab_needed "$PBI_MAKEPORT" "${PBI_BUILDKEY}" "$_cd" "$PBI_AB_TIMESTAMP"
 	 	if [ "$?" = "0" ] ; then