Changeset 6d0c321c


Ignore:
Timestamp:
11/28/13 06:48:58 (14 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
3359ccf
Parents:
175c441
Message:

Fix a bug sourcing a pbi.conf file

File:
1 edited

Legend:

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

    r175c441 r6d0c321c  
    16411641        if [ ! -d "${PBI_CONFDIR}" ] ; then return 0 ; fi 
    16421642        if [ -e "${PBI_CONFDIR}/${PBI_CONFFILE}" ] ; then 
    1643                 unset PBI_MAKEPORT PBI_BUILDKEY PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION 
     1643                unset PBI_MAKEPORT PBI_BUILDKEY PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION PBI_PROGREVISION PBI_AB_NOPKGBUILD 
    16441644                . ${PBI_CONFDIR}/${PBI_CONFFILE} 
    16451645 
     
    60866086        if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
    60876087                # Doing a package build for this PBI 
    6088                 pkg rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null 
     6088                pkg-static rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null 
    60896089                if [ $? -ne 0 ] ; then 
    60906090                        echo "No package found for: ${PBI_MAKEPORT}" 
Note: See TracChangeset for help on using the changeset viewer.