Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Fix a bug sourcing a pbi.conf file
Browse files Browse the repository at this point in the history
  • Loading branch information
Kris Moore committed Nov 28, 2013
1 parent 175c441 commit 6d0c321
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src-sh/pbi-manager10/pbi-manager
View file
Expand Up @@ -1640,7 +1640,7 @@ rm_buildfiles() {
load_pbi_conffile() { load_pbi_conffile() {
if [ ! -d "${PBI_CONFDIR}" ] ; then return 0 ; fi if [ ! -d "${PBI_CONFDIR}" ] ; then return 0 ; fi
if [ -e "${PBI_CONFDIR}/${PBI_CONFFILE}" ] ; then 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} . ${PBI_CONFDIR}/${PBI_CONFFILE}


# Remove any trailing '/' from PBI_MAKEPORT # Remove any trailing '/' from PBI_MAKEPORT
Expand Down Expand Up @@ -6085,7 +6085,7 @@ ab_get_build_list()


if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD" ] ; then if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD" ] ; then
# Doing a package build for this PBI # 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 if [ $? -ne 0 ] ; then
echo "No package found for: ${PBI_MAKEPORT}" echo "No package found for: ${PBI_MAKEPORT}"
continue continue
Expand Down

0 comments on commit 6d0c321

Please sign in to comment.