From owner-svn-src-user@freebsd.org  Fri Jul 10 21:17:51 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E8F2997B38
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 10 Jul 2015 21:17:51 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 F33921E7C;
 Fri, 10 Jul 2015 21:17:50 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6ALHoAe007324;
 Fri, 10 Jul 2015 21:17:50 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6ALHoTl007323;
 Fri, 10 Jul 2015 21:17:50 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201507102117.t6ALHoTl007323@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 10 Jul 2015 21:17:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r285364 - user/cperciva/freebsd-update-build/scripts
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, 10 Jul 2015 21:17:51 -0000

Author: cperciva
Date: Fri Jul 10 21:17:49 2015
New Revision: 285364
URL: https://svnweb.freebsd.org/changeset/base/285364

Log:
  When initializing a new set of builds, INDEX-NEW will be empty.  When we
  filter out /boot/kernel/linker.hints from this empty file, we will be left
  with... an empty file.  Unfortunately, fgrep, having read no lines and
  produced no output, returns an exit status of 1, which sh -e interprets
  as an error.
  
  Add a || true to the fgrep added in r276160 in order to unbreak init
  builds.
  
  Pointy Hat to:	cperciva

Modified:
  user/cperciva/freebsd-update-build/scripts/build.subr

Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr	Fri Jul 10 19:27:19 2015	(r285363)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Fri Jul 10 21:17:49 2015	(r285364)
@@ -900,7 +900,7 @@ stageworld () {
 		# Create publishable version
 		indexpublish < ${WORKDIR}/${M}.new		\
 		    | fgrep -v 'kernel|generic|/boot/kernel/linker.hints' \
-		    > ${WORKDIR}/${M}.new.pub
+		    > ${WORKDIR}/${M}.new.pub || true
 
 		# Copy to staging area
 		H=`sha256 -q ${WORKDIR}/${M}.new.pub`