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

[Gleb Smirnoff]

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