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

[svn at pcbsd.org]

Author: kris
Date: 2011-08-24 10:52:04 -0700 (Wed, 24 Aug 2011)
New Revision: 12257

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

Warn on failures to get the ports distversion



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-08-24 17:30:25 UTC (rev 12256)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-08-24 17:52:04 UTC (rev 12257)
@@ -1443,6 +1443,11 @@
    			PORTVER="${PORTVER}_${PORTREV}"
 		fi
 		PBI_PROGVERSION="${PORTVER}"
+
+		if [ -n "${PBI_PROGVERSION}" ] ; then
+			echo "Warning: Unable to set PBI_PROGVERSION with:"
+		        echo "make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION"
+		fi
 	else
 		exit_err "Failed to locate PBI_PROGVERSION"
 	fi
@@ -5239,6 +5244,10 @@
 	if [ ! -z "${PBI_AB_SSLPRIVKEY}" ] ; then
 		_flags="${_flags} --sign ${PBI_AB_SSLPRIVKEY}"
 	fi
+
+        unset PBI_PROGVERSION
+	get_pbi_progversion
+
 	echo "Starting build of ${_mp} - ${_pv}"
 	echo "pbi_makeport ${_flags} ${_mp}"
 
@@ -5253,7 +5262,6 @@
 	fi
 
 	# Move old PBIs to archived folder
-	get_pbi_progversion
         oldVersion=`cat ${_od}/pbi-version 2>/dev/null`
 	if [ "$oldVersion" != "$PBI_PROGVERSION" ]; then
 		echo "Archiving old PBIs..."
@@ -5697,6 +5705,8 @@
 	_port="$1"
 	_bk="$2"
 	_cd="$3"
+
+        unset PBI_PROGVERSION
 	get_pbi_progversion
 
 	echo "Checking $_port for rebuild in ${PBI_AB_OUTDIR}/$_cd with key of $_bk"