From owner-svn-src-user@FreeBSD.ORG  Fri May 29 16:58:10 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 7554034F;
 Fri, 29 May 2015 16:58:10 +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 63F3B1284;
 Fri, 29 May 2015 16:58:10 +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 t4TGwAt7065489;
 Fri, 29 May 2015 16:58:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4TGwAJi065488;
 Fri, 29 May 2015 16:58:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505291658.t4TGwAJi065488@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: Fri, 29 May 2015 16:58:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r283746 - 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: Fri, 29 May 2015 16:58:10 -0000

Author: gjb
Date: Fri May 29 16:58:09 2015
New Revision: 283746
URL: https://svnweb.freebsd.org/changeset/base/283746

Log:
  Re-sync with the RE repository:
  - Fix the source path for rsync(1) to the FTP staging area.
  - Send rsync(1) output to the log file.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Fri May 29 16:26:08 2015	(r283745)
+++ user/gjb/thermite/thermite.sh	Fri May 29 16:58:09 2015	(r283746)
@@ -269,11 +269,20 @@ ftp_stage() {
 		return 0
 	fi
 
-	mkdir -p "${ftpdir}/${type}"
-	rsync -avH ${CHROOTDIR}/R/ftp-stage/${type}/* \
-		${ftpdir}/${type}/
+	case ${type} in
+		release)
+			_type="releases"
+			;;
+		*)
+			_type="snapshots"
+			;;
+	esac
+
+	mkdir -p "${ftpdir}/${_type}"
+	rsync -avH ${CHROOTDIR}/R/ftp-stage/${_type}/* \
+		${ftpdir}/${_type}/ >> ${logdir}/${_build}.log 2>&1
 	unset BOARDNAME BUILDDATE EMBEDDEDBUILD SVNREVISION
-	unset _build _conf
+	unset _build _conf _type
 	return 0
 }