From owner-svn-src-user@freebsd.org  Fri Sep 23 20:20:51 2016
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 6F529BE8C2B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 23 Sep 2016 20:20:51 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 396F11BC7;
 Fri, 23 Sep 2016 20:20:51 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NKKoIj014889;
 Fri, 23 Sep 2016 20:20:50 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NKKoQI014888;
 Fri, 23 Sep 2016 20:20:50 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201609232020.u8NKKoQI014888@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 23 Sep 2016 20:20:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r306278 - 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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2016 20:20:51 -0000

Author: glebius
Date: Fri Sep 23 20:20:50 2016
New Revision: 306278
URL: https://svnweb.freebsd.org/changeset/base/306278

Log:
  Call nuke() instead of inlining it. The only difference is that nuke()
  sends to /dev/null errors, which are almost always produced by these
  sequence.

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 Sep 23 20:03:28 2016	(r306277)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Fri Sep 23 20:20:50 2016	(r306278)
@@ -747,7 +747,7 @@ stageworld () {
 		# Move $1 to newworld
 		mkdir -p ${WORKDIR}/newworld
 		tar cf - -C ${WORKDIR}/$1 . | tar xf - -C ${WORKDIR}/newworld/
-		umount ${WORKDIR}/$1 || rm -fr ${WORKDIR}/$1 || chflags -R 0 ${WORKDIR}/$1 && rm -fr ${WORKDIR}/$1 || true
+		nuke $1
 		mv ${WORKDIR}/$1-index ${WORKDIR}/newworld-index
 	fi