svn commit: r285364 - user/cperciva/freebsd-update-build/scripts

[Colin Percival]

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`