Date: Fri, 18 Jan 2019 09:51:10 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Ed Maste <emaste@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r343152 - head/usr.sbin/freebsd-update Message-ID: <201901181751.x0IHpAkU056605@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201901181741.x0IHfjs6014631@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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 <aryeeteygerald_rogers.com> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901181751.x0IHpAkU056605>