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

[svn at pcbsd.org]

Author: kris
Date: 2011-09-26 06:31:48 -0700 (Mon, 26 Sep 2011)
New Revision: 12977

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

Fix a bug with PBI_PROGVERSION getting unset



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-26 12:56:35 UTC (rev 12976)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-26 13:31:48 UTC (rev 12977)
@@ -1419,7 +1419,7 @@
 load_pbi_conffile() {
   	if [ ! -d "${PBI_CONFDIR}" ] ; then return 0 ; fi
   	if [ -e "${PBI_CONFDIR}/${PBI_CONFFILE}" ] ; then
-		unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES
+		unset PBI_MAKEPORT PBI_BUILDKEY PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES
 		. ${PBI_CONFDIR}/${PBI_CONFFILE}
 	fi
 }
@@ -5265,6 +5265,7 @@
 	      pbi="$CUR_WORKING_PBI"
 	      unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES
 	      . ${pbi}
+	      get_pbi_progversion
 
 	      _cd=$(dirname $pbi | sed 's|./||')
 	      if [ -z "${PBI_MAKEPORT}" ] ; then