From owner-svn-src-all@freebsd.org Fri Jan 18 17:51:20 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77CB014A595E; Fri, 18 Jan 2019 17:51:20 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBEC06AD60; Fri, 18 Jan 2019 17:51:19 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x0IHpAJ4056606; Fri, 18 Jan 2019 09:51:10 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id x0IHpAkU056605; Fri, 18 Jan 2019 09:51:10 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201901181751.x0IHpAkU056605@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r343152 - head/usr.sbin/freebsd-update In-Reply-To: <201901181741.x0IHfjs6014631@repo.freebsd.org> To: Ed Maste Date: Fri, 18 Jan 2019 09:51:10 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: EBEC06AD60 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2019 17:51:20 -0000 > Author: emaste > Date: Fri Jan 18 17:41:45 2019 > New Revision: 343152 > URL: https://svnweb.freebsd.org/changeset/base/343152 > > Log: > freebsd-update: Use BASEDIR when checking for src component > > src could potentially be installed under the based dir > and not under the root or vice versa. > > PR: 224048 > Submitted by: Gerald Aryeetey > Reviewed by: delphij > MFC after: 1 month > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D18849 > > Modified: > head/usr.sbin/freebsd-update/freebsd-update.sh > > Modified: head/usr.sbin/freebsd-update/freebsd-update.sh > ============================================================================== > --- head/usr.sbin/freebsd-update/freebsd-update.sh Fri Jan 18 16:04:36 2019 (r343151) > +++ head/usr.sbin/freebsd-update/freebsd-update.sh Fri Jan 18 17:41:45 2019 (r343152) > @@ -221,7 +221,7 @@ config_KeepModifiedMetadata () { > config_Components () { > for C in $@; do > if [ "$C" = "src" ]; then > - if [ -e /usr/src/COPYRIGHT ]; then > + if [ -e "${BASEDIR}/usr/src/COPYRIGHT" ]; then > COMPONENTS="${COMPONENTS} ${C}" > else > echo "src component not installed, skipped" > Since your in here fixing... there is a false positive on the detection of what is installed when we zero the size of a set, ie, now that doc.txz is a 0 size set it always thinks you have doc installed due to rounding errors in the calculation that says you have x% of this installed. -- Rod Grimes rgrimes@freebsd.org