Permalink
Browse files

Fix a bug sourcing a pbi.conf file

  • Loading branch information...
1 parent 175c441 commit 6d0c321c7896f2d9f13070201046baf91ccb9edf @kmoore134 kmoore134 committed Nov 28, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 src-sh/pbi-manager10/pbi-manager
@@ -1640,7 +1640,7 @@ rm_buildfiles() {
load_pbi_conffile() {
if [ ! -d "${PBI_CONFDIR}" ] ; then return 0 ; fi
if [ -e "${PBI_CONFDIR}/${PBI_CONFFILE}" ] ; then
- 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
+ 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
. ${PBI_CONFDIR}/${PBI_CONFFILE}
# Remove any trailing '/' from PBI_MAKEPORT
@@ -6085,7 +6085,7 @@ ab_get_build_list()
if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD" ] ; then
# Doing a package build for this PBI
- pkg rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null
+ pkg-static rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null
if [ $? -ne 0 ] ; then
echo "No package found for: ${PBI_MAKEPORT}"
continue

0 comments on commit 6d0c321

Please sign in to comment.