From a72daf935f8e67b6a1013c1814058005447b2abd Mon Sep 17 00:00:00 2001 From: Nick Anderson Date: Fri, 16 Aug 2024 13:13:12 -0500 Subject: [PATCH] Added trailing /. to files promises targeting local_software_dir The trailing /. is how we can explicitly indicate that a directory is desired in CFEngine. Without a trailing ./ CFEngine could get confused and create a single file instead of a directory. Ticket: ENT-12116 Changelog: Title --- cfe_internal/update/update_bins.cf | 2 +- standalone_self_upgrade.cf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe_internal/update/update_bins.cf b/cfe_internal/update/update_bins.cf index ca6650d36c..acf6b63459 100644 --- a/cfe_internal/update/update_bins.cf +++ b/cfe_internal/update/update_bins.cf @@ -262,7 +262,7 @@ bundle agent cfe_internal_update_bins comment => "Ensure the local software directory exists for new binaries to be downloaded to"; - "$(local_software_dir)" + "$(local_software_dir)/." comment => "Copy binary updates from master source on policy server", handle => "cfe_internal_update_bins_files_pkg_copy", copy_from => u_pcp("$(master_software_location)/$(package_dir)", @(update_def.policy_servers)), diff --git a/standalone_self_upgrade.cf.in b/standalone_self_upgrade.cf.in index 3850b7fab2..9e7a5e08b8 100644 --- a/standalone_self_upgrade.cf.in +++ b/standalone_self_upgrade.cf.in @@ -263,7 +263,7 @@ bundle agent cfengine_software_cached_locally # NOTE This is pegged to the single upstream policy hub, it won't fail # over to a secondary for copying the binarys to update. - "$(local_software_dir)" + "$(local_software_dir)/." comment => "Copy binary updates from master source on policy server", handle => "cfe_internal_update_bins_files_pkg_copy", copy_from => u_dsync( "$(master_software_location)/$(package_dir)", $(sys.policy_hub) ),