Skip to content

ENT-10962: Fixed mission portal restoring changes from /var/cfengine/share/GUI (3.21) #2891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2024
Merged

ENT-10962: Fixed mission portal restoring changes from /var/cfengine/share/GUI (3.21) #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff1308
Added no_backup_cp_compare copy_from body to stdlib
nickanderson Dec 12, 2023
32d71de
Fixed restoration of Mission Portal application to packaged content w…
nickanderson Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfe_internal/enterprise/CFE_knowledge.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bundle agent cfe_internal_setup_knowledge
"$(cfe_internal_hub_vars.docroot)"
comment => "Copy the basic knowledge base configuration from the installation to doc root",
handle => "cfe_internal_setup_knowledge_files_doc_root_1",
copy_from => no_backup_cp("$(sys.workdir)/share/GUI"),
copy_from => no_backup_cp_compare("$(sys.workdir)/share/GUI", "binary"),
depth_search => recurse("inf");

any::
Expand Down
13 changes: 13 additions & 0 deletions lib/files.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,19 @@ body copy_from no_backup_cp(from)

##

body copy_from no_backup_cp_compare(from, comparison)
# @brief Copy a local file (`from`) based on comparison (`comparison`) and don't make any backup of the previous version
#
# @param from The path to the source file.
# @param comparison The comparison to use. (mtime|ctime|atime|exists|binary|hash|digest)
{
source => "$(from)";
copy_backup => "false";
compare => "$(comparison)";
}

##

body copy_from no_backup_dcp(from)
# @brief Copy a local file if contents have changed, and don't make any backup
# of the previous version
Expand Down