Browse files

Fix PROGREVISION handling with pkgng

  • Loading branch information...
1 parent 8680865 commit 4309def1303cacfdc60ef52490839219eec03bea @kmoore134 kmoore134 committed Nov 27, 2013
Showing with 6 additions and 2 deletions.
  1. +6 −2 src-sh/pbi-manager10/pbi-manager
View
8 src-sh/pbi-manager10/pbi-manager
@@ -1669,9 +1669,13 @@ get_pbi_progversion() {
# Check first if we have this pkg in PKGNG
if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then
- local testPkgVer="`pkg rquery %v ${PBI_MAKEPORT}`"
+ testPkgVer="`pkg rquery '%v' ${PBI_MAKEPORT}`"
if [ -n "$testPkgVer" ] ; then
- export PBI_PROGVERSION="$testPkgVer"
+ PBI_PROGVERSION="$testPkgVer"
+ # If we have a REVISION, use it as well
+ if [ -n "$PBI_PROGREVISION" ] ; then
+ PBI_PROGVERSION="${PBI_PROGVERSION}_${PBI_PROGREVISION}"
+ fi
return 0
fi
fi

0 comments on commit 4309def

Please sign in to comment.