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

svn at pcbsd.org svn at pcbsd.org
Wed Aug 1 09:29:40 PDT 2012


Author: kris
Date: 2012-08-01 16:29:39 +0000 (Wed, 01 Aug 2012)
New Revision: 18059

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

Display better output for BUILDKEY bumps, and fix bug setting PORTVER



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 16:24:38 UTC (rev 18058)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 16:29:39 UTC (rev 18059)
@@ -1502,9 +1502,10 @@
   		PORTREV="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTREVISION 2>/dev/null`"
   		if [ -n "${PORTREV}" -a "${PORTREV}" != "0" ]
  		then
-   			PORTVER="${PORTVER}_${PORTREV}"
+			PBI_PROGVERSION="${PORTVER}_${PORTREV}"
+		else
+			PBI_PROGVERSION="${PORTVER}"
 		fi
-		PBI_PROGVERSION="${PORTVER}"
 
 		if [ -z "${PBI_PROGVERSION}" ] ; then
 			echo "Warning: Unable to set PBI_PROGVERSION with:"
@@ -6123,7 +6124,7 @@
 	if [ -e "${PBI_AB_OUTDIR}/${_cd}/pbi-buildkey" ] ; then
 		if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-buildkey`" != "$_bk" \
 			 -a -n "${_bk}" ]; then 
-                   echo "BUILDKEY bump, rebuild triggered."
+                   echo "$_port BUILDKEY bump, rebuild triggered."
                    internal_ab_priority="9"
                    return 0
                 fi
@@ -6169,7 +6170,6 @@
 	oldVersion=`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-version`
 	if [ "$oldVersion" != "$PBI_PROGVERSION" ]; then 
 		oldPortVer="`echo $oldVersion | rev | cut -d '_' -f 2- | rev`"
-		#echo "OldVersion: $oldPortVer - NewVersion: $PORTVER -"
 		if [ "$PORTVER" = "$oldPortVer" ] ; then
 			# Just a minor portrev bump
           		internal_ab_priority="2"



More information about the Commits mailing list