From owner-svn-src-user@FreeBSD.ORG  Thu Aug  7 17:19:10 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A6BBA459
 for <svn-src-user@freebsd.org>; Thu,  7 Aug 2014 17:19:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7BC2F2A84
 for <svn-src-user@freebsd.org>; Thu,  7 Aug 2014 17:19:10 +0000 (UTC)
Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 2ddd
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 17:19:10 +0000
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 7 Aug 2014 17:19:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r269677 - user/gjb/thermite
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e3b50e.2ddd.798713ec@svn.freebsd.org>
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
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: Thu, 07 Aug 2014 17:19:10 -0000

Author: gjb
Date: Thu Aug  7 17:19:10 2014
New Revision: 269677
URL: http://svnweb.freebsd.org/changeset/base/269677

Log:
  Syncronize local changes to thermite.sh:
  
   - In build_release(), use source_config() instead of
     continuing if the configuration file exists to prevent
     erroneous output from printenv(1).
  
   - In truncate_logs(), only create the log file if there is
     a corresponding configuration file for the build, otherwise
     log files that will never be used are created (such as
     11-amd64-GENERIC64-snap.log).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Thu Aug  7 17:05:25 2014	(r269676)
+++ user/gjb/thermite/thermite.sh	Thu Aug  7 17:19:10 2014	(r269677)
@@ -118,6 +118,7 @@ check_use_zfs() {
 }
 
 truncate_logs() {
+	source_config || return 0
 	echo > ${logdir}/${rev}-${arch}-${kernel}-${type}.log
 	return 0
 }
@@ -241,7 +242,7 @@ send_logmail() {
 build_release() {
 	_build="${rev}-${arch}-${kernel}-${type}"
 	_conf="${scriptdir}/${_build}.conf"
-	[ ! -e ${_conf} ] && return 0
+	source_config || return 0
 	info "Building release: ${_build}"
 	printenv >> ${logdir}/${_build}.log
 	env -i /bin/sh ${srcdir}/release.sh -c ${_conf} \