Date: Sun, 22 Sep 2019 19:53:29 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352608 - stable/12/usr.sbin/freebsd-update Message-ID: <201909221953.x8MJrTJe066524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo (ports committer) Date: Sun Sep 22 19:53:29 2019 New Revision: 352608 URL: https://svnweb.freebsd.org/changeset/base/352608 Log: MFC r352542: freebsd-update: Fix src component detection PR: 224048, 238558, 239997 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D21579 Modified: stable/12/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- stable/12/usr.sbin/freebsd-update/freebsd-update.sh Sun Sep 22 19:23:00 2019 (r352607) +++ stable/12/usr.sbin/freebsd-update/freebsd-update.sh Sun Sep 22 19:53:29 2019 (r352608) @@ -221,6 +221,14 @@ config_KeepModifiedMetadata () { # Add to the list of components which should be kept updated. config_Components () { for C in $@; do + COMPONENTS="${COMPONENTS} ${C}" + done +} + +# Remove src component from list if it isn't installed +finalize_components_config () { + COMPONENTS="" + for C in $@; do if [ "$C" = "src" ]; then if [ -e "${BASEDIR}/usr/src/COPYRIGHT" ]; then COMPONENTS="${COMPONENTS} ${C}" @@ -3284,6 +3292,7 @@ get_params () { parse_cmdline $@ parse_conffile default_params + finalize_components_config ${COMPONENTS} } # Fetch command. Make sure that we're being called
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909221953.x8MJrTJe066524>