svn commit: r352542 - head/usr.sbin/freebsd-update

[Michael Gmelin]

Author: grembo (ports committer)
Date: Thu Sep 19 21:13:51 2019
New Revision: 352542
URL: https://svnweb.freebsd.org/changeset/base/352542

Log:
  Fix src component detection
  
  Reviewed by:	emaste
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D21579

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	Thu Sep 19 20:45:23 2019	(r352541)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Thu Sep 19 21:13:51 2019	(r352542)
@@ -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