Skip to content

Commit

Permalink
Fixes #16734: Update agent to CFEngine 3.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
amousset committed Mar 30, 2020
1 parent b4cf685 commit dd05942
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 265 deletions.
4 changes: 2 additions & 2 deletions rudder-agent/SOURCES/Makefile
Expand Up @@ -24,8 +24,8 @@ RUDDER_MAJOR_VERSION := $(shell echo ${RUDDER_VERSION_TO_PACKAGE} | cut -d'.' -f

FUSION_RELEASE = 2.4.3
FUSION_SHA1 = 66d6e699575e98a6c050b39ca27c72a20f5569c3
CFENGINE_RELEASE = 3.12.4
CFENGINE_SHA1 = f7103c636dc006a5081bf11c2f5a09c7e1f99fbf
CFENGINE_RELEASE = 3.15.1
CFENGINE_SHA1 = 0698a87fb34add3dae0110f691ec175134060e4d
LMDB_RELEASE = 0.9.22
LMDB_SHA1 = 5d62d4c7527f3474f60a0d87db2bfd539e6493eb
# Default openssl version to use
Expand Down
@@ -1,8 +1,8 @@
diff --git a/libpromises/generic_agent.c b/libpromises/generic_agent.c
index e2da48bc8..1574e6827 100644
index 8441bfb62..fb9f8d100 100644
--- a/libpromises/generic_agent.c
+++ b/libpromises/generic_agent.c
@@ -156,43 +156,9 @@ Policy *SelectAndLoadPolicy(GenericAgentConfig *config, EvalContext *ctx, bool v
@@ -156,44 +156,9 @@ Policy *SelectAndLoadPolicy(GenericAgentConfig *config, EvalContext *ctx, bool v
{
policy = LoadPolicy(ctx, config);
}
Expand Down Expand Up @@ -31,7 +31,8 @@ index e2da48bc8..1574e6827 100644
-
- char filename[PATH_MAX];
- GetReleaseIdFile(GetInputDir(), filename, sizeof(filename));
- FILE *release_id_stream = safe_fopen(filename, "w");
- FILE *release_id_stream = safe_fopen_create_perms(filename, "w",
- CF_PERMS_DEFAULT);
- if (release_id_stream == NULL)
- {
- Log(LOG_LEVEL_ERR, "Failed to open the release_id file for writing during failsafe");
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit dd05942

Please sign in to comment.