Revision ad33d7c8
Added by Alexis Mousset over 7 years ago
| rudder-agent/SOURCES/Makefile | ||
|---|---|---|
|
RUDDER_VERSION_TO_PACKAGE = <put Rudder version or version-snapshot here>
|
||
|
RUDDER_MAJOR_VERSION := $(shell echo ${RUDDER_VERSION_TO_PACKAGE} | cut -d'.' -f 1-2)
|
||
|
|
||
|
CFENGINE_RELEASE = 3.10.0b1
|
||
|
CFENGINE_RELEASE = 3.10.0
|
||
|
FUSION_RELEASE = 2.3.17
|
||
|
LMDB_RELEASE = 0.9.18
|
||
|
OPENSSL_RELEASE = 1.0.2h
|
||
| rudder-agent/SOURCES/patches/cfengine/90-avoid-useless-expensive-call.patch | ||
|---|---|---|
|
From 1c76412c2c8e70a813f267f5dcd4d17d3aad8693 Mon Sep 17 00:00:00 2001
|
||
|
From: Alexis Mousset <contact@amousset.me>
|
||
|
Date: Wed, 30 Nov 2016 20:34:52 +0100
|
||
|
Subject: [PATCH] CFE-2524: Only call BundleResolvePromiseType when it is
|
||
|
needed as it is an expensive call
|
||
|
|
||
|
---
|
||
|
libpromises/expand.c | 10 +++++-----
|
||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
||
|
diff --git a/libpromises/expand.c b/libpromises/expand.c
|
||
|
index 002588a..c8b4ecd 100644
|
||
|
--- a/libpromises/expand.c
|
||
|
+++ b/libpromises/expand.c
|
||
|
@@ -647,14 +647,14 @@ void BundleResolve(EvalContext *ctx, const Bundle *bundle)
|
||
|
"Resolving classes and variables in 'bundle %s %s'",
|
||
|
bundle->type, bundle->name);
|
||
|
|
||
|
- /* Necessary to parse vars *before* classes for cases like this:
|
||
|
- * 00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf.sub
|
||
|
- * -- see bundle "classify". */
|
||
|
- BundleResolvePromiseType(ctx, bundle, "vars", VerifyVarPromise);
|
||
|
-
|
||
|
/* PRE-EVAL: evaluate classes of common bundles. */
|
||
|
if (strcmp(bundle->type, "common") == 0)
|
||
|
{
|
||
|
+ /* Necessary to parse vars *before* classes for cases like this:
|
||
|
+ * 00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf.sub
|
||
|
+ * -- see bundle "classify". */
|
||
|
+ BundleResolvePromiseType(ctx, bundle, "vars", VerifyVarPromise);
|
||
|
+
|
||
|
BundleResolvePromiseType(ctx, bundle, "classes", VerifyClassPromise);
|
||
|
}
|
||
|
|
||
Also available in: Unified diff
Fixes #9866: Use the 3.10.0 release in Rudder 4.1