From owner-svn-src-stable@freebsd.org Tue Mar 21 09:14:58 2017 Return-Path: Delivered-To: svn-src-stable@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 BB36CD14755; Tue, 21 Mar 2017 09:14:58 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8602D174; Tue, 21 Mar 2017 09:14:57 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp.greenhost.nl ([213.108.104.138]) by smarthost1.greenhost.nl with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1cqFd8-00079V-FA; Tue, 21 Mar 2017 09:59:02 +0100 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org, "Ngie Cooper" Subject: Re: svn commit: r315660 - stable/11/tools/build/mk References: <201703210513.v2L5DFes023003@repo.freebsd.org> Date: Tue, 21 Mar 2017 09:59:01 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: <201703210513.v2L5DFes023003@repo.freebsd.org> User-Agent: Opera Mail/12.16 (FreeBSD) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, BAYES_50 autolearn=disabled version=3.4.0 X-Scan-Signature: 9b84bad32751a42de3aa9e7877f1ca86 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 09:14:58 -0000 On Tue, 21 Mar 2017 06:13:15 +0100, Ngie Cooper wrote: > Author: ngie > Date: Tue Mar 21 05:13:14 2017 > New Revision: 315660 > URL: https://svnweb.freebsd.org/changeset/base/315660 > > Log: > MFC r314241,r315228: > r314241: > Fill in MK_RESCUE by finding paths in ${DESTDIR}/rescue and adding > them to OLD_FILES/OLD_DIRS, as necessary. > r315228: > Redirect standard error from find /rescue to /dev/null > This mutes noise from find when /rescue doesn't exist. IMHO it is better to check the existence in an if before the find. My experience is that other errors will show up in the future which are then ignored by piping to /dev/null. Ronald. > > Modified: > stable/11/tools/build/mk/OptionalObsoleteFiles.inc > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc > ============================================================================== > --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 21 > 03:42:28 2017 (r315659) > +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 21 > 05:13:14 2017 (r315660) > @@ -7131,9 +7131,14 @@ OLD_FILES+=usr/share/man/man1/rlog.1.gz > OLD_FILES+=usr/share/man/man5/rcsfile.5.gz > .endif > -#.if ${MK_RESCUE} == no > -# to be filled in or replaced with a special target > -#.endif > +.if ${MK_RESCUE} == no > +. if exists(${DESTDIR}${TESTSBASE}) > +RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e > 's,^${DESTDIR}/,,'; echo > +OLD_DIRS+=${RESCUE_DIRS} > +RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d 2>/dev/null | sed -e > 's,^${DESTDIR}/,,'; echo > +OLD_FILES+=${RESCUE_FILES} > +. endif > +.endif > .if ${MK_ROUTED} == no > OLD_FILES+=rescue/routed > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"