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

[svn at pcbsd.org]

Author: kris
Date: 2012-08-01 15:52:36 +0000 (Wed, 01 Aug 2012)
New Revision: 18053

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

Fix an issue with PBI priorities set to 00



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 15:43:51 UTC (rev 18052)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 15:52:36 UTC (rev 18053)
@@ -5519,6 +5519,9 @@
                      continue
                    fi
 
+		   # Fix a 00
+		   if [ "${PBI_AB_PRIORITY}" = "00" ] ; then PBI_AB_PRIORITY="0"; fi
+
 		   # Bump up the supplied AB priority
 		   if [ -n "${PBI_AB_PRIORITY}" ] ; then 
                       internal_ab_priority=`eval $PBI_AB_PRIORITY + 10`
@@ -6111,7 +6114,8 @@
 	_bk="$2"
 	_cd="$3"
 	local _abkey="$4"
-        internal_ab_priority=1
+        internal_ab_priority="1"
+	export internal_ab_priority
         unset PBI_PROGVERSION
 
 	# Check PBI_BUILDKEY, see if we have a manual rebuild triggered
@@ -6119,7 +6123,7 @@
 		if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-buildkey`" != "$_bk" \
 			 -a -n "${_bk}" ]; then 
                    echo "BUILDKEY bump, rebuild triggered."
-                   internal_ab_priority=9
+                   internal_ab_priority="9"
                    return 0
                 fi
 	fi
@@ -6146,14 +6150,14 @@
 	ls ${PBI_AB_OUTDIR}/${_cd}/*.pbi >/dev/null 2>/dev/null
 	if [ "${?}" != "0" ]; then 
 	  #echo "No existing PBI"
-          internal_ab_priority=8
+          internal_ab_priority="8"
           return 0 
         fi
 
 	# See if we have a saved version
 	if [ ! -e "${PBI_AB_OUTDIR}/${_cd}/pbi-version" ]; then 
 		#echo "No saved pbi-version"
-          	internal_ab_priority=7
+          	internal_ab_priority="7"
 		return 0
 	fi
 
@@ -6166,12 +6170,13 @@
 		local oldPortVer=`echo $oldVersion | rev | cut -d '_' -f 2- | rev`
 		if [ "$PORTVER" = "$oldPortVer" ] ; then
 			# Just a minor portrev bump
-          		internal_ab_priority=2
+          		internal_ab_priority="2"
+			echo "$_port revision bump: $oldVersion -> $PBI_PROGVERSION"
 		else
 			# Real version change
-          		internal_ab_priority=3
+          		internal_ab_priority="3"
+			echo "$_port version bump: $oldVersion -> $PBI_PROGVERSION"
 		fi
-		echo "$_port version bump: $oldVersion -> $PBI_PROGVERSION"
 		return 0
 	fi