From owner-svn-src-user@FreeBSD.ORG  Wed May 27 01:04:45 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 00402119;
 Wed, 27 May 2015 01:04:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E28359B7;
 Wed, 27 May 2015 01:04:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4R14iV8006638;
 Wed, 27 May 2015 01:04:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4R14iMw006637;
 Wed, 27 May 2015 01:04:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505270104.t4R14iMw006637@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 27 May 2015 01:04:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r283594 - user/gjb/thermite
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 May 2015 01:04:45 -0000

Author: gjb
Date: Wed May 27 01:04:44 2015
New Revision: 283594
URL: https://svnweb.freebsd.org/changeset/base/283594

Log:
  Re-sync with RE repository:
  
  - Only run ftp_stage() if EVERYTHINGISFINE variable is set,
    as an anti-foot-shooting measure.
  - rsync(1) output from 'ftp-stage' target to a main directory
    on the build host, defined by ftpdir, in ftp_stage().
  - Create 'ftpdir' before rsync(1).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Tue May 26 21:58:22 2015	(r283593)
+++ user/gjb/thermite/thermite.sh	Wed May 27 01:04:44 2015	(r283594)
@@ -247,6 +247,7 @@ ftp_stage() {
 	_build="${rev}-${arch}-${kernel}-${type}"
 	_conf="${scriptdir}/${_build}.conf"
 	source_config || return 0
+	[ -z "${EVERYTHINGISFINE}" ] && return 0
 
 	load_stage_env
 	info "Staging for ftp: ${_build}"
@@ -262,6 +263,15 @@ ftp_stage() {
 		KERNCONF=${KERNEL} \
 		ftp-stage >> ${logdir}/${_build}.log 2>&1
 
+	if [ -z "${ftpdir}" ]; then
+		info "FTP directory (ftpdir) not set."
+		info "Refusing to rsync(1) to the stage area."
+		return 0
+	fi
+
+	mkdir -p "${ftpdir}/${type}"
+	rsync -avH ${CHROOTDIR}/R/ftp-stage/${type}/* \
+		${ftpdir}/${type}/
 	unset BOARDNAME BUILDDATE EMBEDDEDBUILD SVNREVISION
 	unset _build _conf
 	return 0