From e295b1138d20df97c8f6eab3aec11988778c1f2a Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 25 Aug 2015 14:10:42 -0300 Subject: Do not set PKG_RSYNC_HOSTNAME automatically --- tools/builder_common.sh | 5 +++++ tools/builder_defaults.sh | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 7d79216..6378bb3 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1922,6 +1922,11 @@ poudriere_bulk() { LOGFILE=${BUILDER_LOGS}/poudriere.log + if [ -z "${DO_NOT_UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then + echo ">>> ERROR: PKG_RSYNC_HOSTNAME is not set" + print_error_pfS + fi + poudriere_create_ports_tree [ -d /usr/local/etc/poudriere.d ] || \ diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index dc8666d..0aa7461 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -280,7 +280,6 @@ export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.c export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} # Host to rsync pkg repos from poudriere -export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-"beta.pfsense.org"} export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} -- cgit v1.1