From 5ab18cfaa6773629817dfd7ea143b53d88d92d38 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 19 Feb 2017 18:12:48 +0100 Subject: Bypass portageq in test suite for testing on Ubuntu --- bin/porticron | 2 +- test.bats | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/porticron b/bin/porticron index 844f6ce..dba785e 100755 --- a/bin/porticron +++ b/bin/porticron @@ -118,7 +118,7 @@ FQDN=$(hostname --fqdn) HOST=$(hostname -s) IP=$(dig +short ${FQDN} | tr '\n' ' ') : ${DATE:=$(date -R)} -PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo) +: ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} # defaults, second half : ${RCPT:=root} diff --git a/test.bats b/test.bats index 240dddc..81a0e88 100755 --- a/test.bats +++ b/test.bats @@ -16,6 +16,7 @@ teardown() { _clear_state ; } PORTICRON() { DATE="$(cat test/data/date-r-output.txt)" \ EMERGE=test/mocks/emerge \ + PORTDIR=/usr/portage \ GLSA_CHECK=/bin/true \ SENDMAIL=${SENDMAIL:-/bin/true} \ bin/porticron \ -- cgit v1.2.3-65-gdbad