Changeset 4309def


Ignore:
Timestamp:
Nov 27, 2013 6:40:35 PM (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1
Children:
7b37334
Parents:
8680865
Message:

Fix PROGREVISION handling with pkgng

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    rc15e380 r4309def  
    16701670        # Check first if we have this pkg in PKGNG 
    16711671        if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then 
    1672                 local testPkgVer="`pkg rquery %v ${PBI_MAKEPORT}`" 
     1672                testPkgVer="`pkg rquery '%v' ${PBI_MAKEPORT}`" 
    16731673                if [ -n "$testPkgVer" ] ; then 
    1674                         export PBI_PROGVERSION="$testPkgVer" 
     1674                        PBI_PROGVERSION="$testPkgVer" 
     1675                        # If we have a REVISION, use it as well 
     1676                        if [ -n "$PBI_PROGREVISION" ] ; then 
     1677                                PBI_PROGVERSION="${PBI_PROGVERSION}_${PBI_PROGREVISION}" 
     1678                        fi 
    16751679                        return 0 
    16761680                fi 
Note: See TracChangeset for help on using the changeset viewer.