Changeset 52c32d9


Ignore:
Timestamp:
09/17/13 12:50:14 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b
Parents:
b1511eb
Message:

Recheck the PBI version, in case the PKGNG installed version
does not match whats in the local ports tree

File:
1 edited

Legend:

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

    rb1511eb r52c32d9  
    15741574                if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi 
    15751575        else 
     1576                # Check first if we have this pkg in PKGNG 
     1577                if [ -e "/usr/local/sbin/pkg-static" ] ; then 
     1578                        local testPkgVer="`pkg info -O ${PBI_MAKEPORT} | awk '{print $1}' | rev | cut -d '-' -f 1 | rev`" 
     1579                        if [ -n "$testPkgVer" ] ; then 
     1580                                export PBI_PROGVERSION="$testPkgVer" 
     1581                                return 0 
     1582                        fi 
     1583                fi 
     1584 
    15761585                return 0 
    15771586        fi 
    15781587 
     1588        # Get the version from ports 
    15791589        if [ -z "${PBI_PROGVERSION}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then 
    15801590                PORTVER="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION PORTSDIR=${PORTSDIR} 2>/dev/null`" 
     
    66836693        start_postbuild_script 
    66846694        start_pbi_mkportafter 
     6695 
     6696        # Get the version again, in case we installed from pkgng and it doesn't match ports 
     6697        get_pbi_progversion 
    66856698 
    66866699        # Prune any proto / build specific ports 
Note: See TracChangeset for help on using the changeset viewer.