From owner-svn-src-releng@freebsd.org  Mon Sep 23 15:58:55 2019
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C0BDF89B9;
 Mon, 23 Sep 2019 15:58:55 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46cTWz1HGdz4BWJ;
 Mon, 23 Sep 2019 15:58:55 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BB761931B;
 Mon, 23 Sep 2019 15:58:55 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8NFwsqR002802;
 Mon, 23 Sep 2019 15:58:54 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8NFwsac002801;
 Mon, 23 Sep 2019 15:58:54 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201909231558.x8NFwsac002801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Mon, 23 Sep 2019 15:58:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r352628 - releng/12.1/usr.sbin/freebsd-update
X-SVN-Group: releng
X-SVN-Commit-Author: grembo
X-SVN-Commit-Paths: releng/12.1/usr.sbin/freebsd-update
X-SVN-Commit-Revision: 352628
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-releng>, 
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Sep 2019 15:58:55 -0000

Author: grembo (ports committer)
Date: Mon Sep 23 15:58:54 2019
New Revision: 352628
URL: https://svnweb.freebsd.org/changeset/base/352628

Log:
  MF stable/12 r352608
  
  Approved by:	re (gjb)
  
  r352608:
  freebsd-update: Fix src component detection
  
  In case BASEDIR was set to a directory that differed from the default
  filesystem root, freebsd-update wrongly checked for the existence
  of /usr/src/COPYRIGHT to determine if the src component was
  installed. Existing code to address this wasn't effective due to the
  order in which configuration options were evaluated.
  
  PR:		224048, 238558, 239997
  Reviewed by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D21579

Modified:
  releng/12.1/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- releng/12.1/usr.sbin/freebsd-update/freebsd-update.sh	Mon Sep 23 15:08:17 2019	(r352627)
+++ releng/12.1/usr.sbin/freebsd-update/freebsd-update.sh	Mon Sep 23 15:58:54 2019	(r352628)
@@ -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