Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Jan 2016 22:44:23 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r293784 - user/cperciva/freebsd-update-build/scripts
Message-ID:  <201601122244.u0CMiNeb099653@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Tue Jan 12 22:44:23 2016
New Revision: 293784
URL: https://svnweb.freebsd.org/changeset/base/293784

Log:
  - Instead of dumping patch(1) stdout to console, save it in $1-patch.log,
    like rest of the build stages do.
  - Report the patching stage with log().

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	Tue Jan 12 20:53:57 2016	(r293783)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Tue Jan 12 22:44:23 2016	(r293784)
@@ -409,7 +409,7 @@ applypatches () {
 				echo ${file}
 			fi
 		done | xargs rm -f
-	done < $2 2> ${WORKDIR}/$1-patch.log
+	done < $2 > ${WORKDIR}/$1-patch.log 2>&1
 	cd -
 }
 
@@ -446,6 +446,7 @@ patchworld () {
 	# Apply patches, in order of increasing patch level.  The
 	# order matters in case we have multiple security advisories
 	# affecting the same code.
+	log "Patching world+src"
 	ls ${PATCHDIR} |
 	    sort -n > ${WORKDIR}/patchlist.tmp
 	applypatches $1 ${WORKDIR}/patchlist.tmp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601122244.u0CMiNeb099653>