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

svn at pcbsd.org svn at pcbsd.org
Sat Oct 13 08:54:11 PDT 2012


Author: kris
Date: 2012-10-13 15:54:10 +0000 (Sat, 13 Oct 2012)
New Revision: 19662

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

Fix a bug with incorrect versions being shown after building a PBI



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-13 14:15:19 UTC (rev 19661)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-13 15:54:10 UTC (rev 19662)
@@ -5588,6 +5588,7 @@
 	rm ${PBI_TMPDIR}/${build}.od 2>/dev/null
 	rm ${PBI_TMPDIR}/${build}.mp 2>/dev/null
 	rm ${PBI_TMPDIR}/${build}.cd 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.pv 2>/dev/null
 	rm ${PBI_TMPDIR}/${build}.zmnt 2>/dev/null
 }
 
@@ -5910,6 +5911,7 @@
 	echo "${_od}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.od"
 	echo "${_mp}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.mp"
 	echo "${_cd}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.cd"
+	echo "${PBI_PROGVERSION}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.pv"
 	pbi_makeport ${_flags} ${_mp} >>${_od}/build.log 2>>${_od}/build.log &
   	echo "$!" > ${PBI_TMPDIR}/${eBuilder}.pid
 
@@ -5921,10 +5923,11 @@
 	_od="`cat ${PBI_TMPDIR}/${build}.od`"
 	_mp="`cat ${PBI_TMPDIR}/${build}.mp`"
 	_cd="`cat ${PBI_TMPDIR}/${build}.cd`"
+	_pv="`cat ${PBI_TMPDIR}/${build}.pv`"
 	sleep 1
 
 	if [ -e "${PBI_TMPDIR}/${build}.result" -a "`cat ${PBI_TMPDIR}/${build}.result`" = "0" ] ; then
-		echo "$PBI_PROGVERSION" > "${_od}/pbi-version"
+		echo "$_pv" > "${_od}/pbi-version"
 		echo "OK" > "${_od}/pbi-result"
 
 		# Save the mdate file



More information about the Commits mailing list