Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix an issue getting PBI_PROGVERSION from pkgng

  • Loading branch information...
commit c65ccb6fbb6bd227d03dbbad1040e229dc3b8282 1 parent e7f8fce
@kmoore134 kmoore134 authored
Showing with 9 additions and 9 deletions.
  1. +9 −9 src-sh/pbi-manager10/pbi-manager
View
18 src-sh/pbi-manager10/pbi-manager
@@ -1635,18 +1635,18 @@ get_pbi_progversion() {
# If we have PBI_PROGVERSION now set
if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi
else
- # Check first if we have this pkg in PKGNG
- if [ -e "/usr/local/sbin/pkg-static" ] ; then
- local testPkgVer="`pkg query %v ${PBI_MAKEPORT}`"
- if [ -n "$testPkgVer" ] ; then
- export PBI_PROGVERSION="$testPkgVer"
- return 0
- fi
- fi
-
return 0
fi
+ # Check first if we have this pkg in PKGNG
+ if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then
+ local testPkgVer="`pkg query %v ${PBI_MAKEPORT}`"
+ if [ -n "$testPkgVer" ] ; then
+ export PBI_PROGVERSION="$testPkgVer"
+ return 0
+ fi
+ fi
+
# Get the version from ports
if [ -z "${PBI_PROGVERSION}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then
PORTVER="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION PORTSDIR=${PORTSDIR} 2>/dev/null`"
Please sign in to comment.
Something went wrong with that request. Please try again.