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

[svn at pcbsd.org]

Author: kris
Date: 2012-08-01 17:26:58 +0000 (Wed, 01 Aug 2012)
New Revision: 18069

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

Don't inflate priority of PBIs set to 00 / 0



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 17:20:00 UTC (rev 18068)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-01 17:26:58 UTC (rev 18069)
@@ -5513,14 +5513,20 @@
 		     if [ -z "$PBI_AB_PRIORITY" ] ; then 
                        CUR_PRIORITY_PBI="$internal_ab_priority"
 	             else
-		       if [ "${PBI_AB_PRIORITY}" = "00" ] ; then PBI_AB_PRIORITY="0"; fi
-                       CUR_PRIORITY_PBI=`expr $PBI_AB_PRIORITY + 10`
+		       if [ "${PBI_AB_PRIORITY}" = "00" -o "$PBI_AB_PRIORITY" = "0" ]; then 
+                         CUR_PRIORITY_PBI="$internal_ab_priority"
+		       else
+                         CUR_PRIORITY_PBI=`expr $PBI_AB_PRIORITY + 10`
+		       fi
                      fi
+		     echo "Setting higher priority target: ${pbi} - Priority: ${CUR_PRIORITY_PBI}"
                      continue
                    fi
 
-		   # Fix a 00
-		   if [ "${PBI_AB_PRIORITY}" = "00" ] ; then PBI_AB_PRIORITY="0"; fi
+		   # Unset the 00
+		   if [ "${PBI_AB_PRIORITY}" = "00" -o "$PBI_AB_PRIORITY" = "0" ] ; then 
+		      unset PBI_AB_PRIORITY
+		   fi
 
 		   # Bump up the supplied AB priority
 		   if [ -n "${PBI_AB_PRIORITY}" ] ; then