diff options
| author | Kubilay Kocak <koobs@users.noreply.github.com> | 2019-07-16 12:45:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 12:45:21 +0300 |
| commit | f438238913a9eaf7adf877aa9bd87f5b4bd731fc (patch) | |
| tree | 3b653209bc9962dbfe465e5a13afc47ae28911ff /src | |
| parent | c07b5f4e610fff49390bce1a1a0426ad0845d5fb (diff) | |
Narrow make.conf setup scope
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/testport.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh index 1b5a4c2a..016cc602 100755 --- a/src/share/poudriere/testport.sh +++ b/src/share/poudriere/testport.sh @@ -205,11 +205,10 @@ fi injail /usr/bin/make -C ${PORTSDIR}/${ORIGIN} maintainer ECHO_CMD=true || \ err 1 "Port is broken" -__MAKE_CONF=$(mktemp -t poudriere-make.conf) -setup_makeconf ${__MAKE_CONF} "${JAILNAME}" "${PTNAME}" "${SETNAME}" - if [ $CONFIGSTR -eq 1 ]; then command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use -c." + __MAKE_CONF=$(mktemp -t poudriere-make.conf) + setup_makeconf ${__MAKE_CONF} "${JAILNAME}" "${PTNAME}" "${SETNAME}" PORTSDIR=${portsdir} \ __MAKE_CONF=${__MAKE_CONF} \ PORT_DBDIR=${MASTERMNT}/var/db/ports \ |