Fixes #11729: eval usage is not compatible with CFEngine < 3.9

Normation · Nov 14, 2017 · 9118e12 · 9118e12
2 parents 5eee98f + 9cd4d0c
commit 9118e12
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/tests/acceptance/30_generic_methods/unsafe/service_ensure_running.cf b/tests/acceptance/30_generic_methods/unsafe/service_ensure_running.cf
@@ -22,8 +22,10 @@ body common control
 bundle agent init
 {
   vars:
-    !aix::
+    debian::
       "service_name"  string => "cron";
+    redhat::
+      "service_name"  string => "crond";
     aix::
       "service_name"  string => "syslogd";
 }

diff --git a/tests/acceptance/30_generic_methods/unsafe/service_reload.cf b/tests/acceptance/30_generic_methods/unsafe/service_reload.cf
@@ -24,11 +24,11 @@ bundle agent init
 {
   vars:
     redhat::
-      "service_script" string => "sshd";
+      "service_script" string => "crond";
     aix::
       "service_script" string => "syslogd";
-    !(redhat|aix)::
-      "service_script" string => "ssh";
+    debian::
+      "service_script" string => "cron";
 }
 
 #######################################################

diff --git a/tests/acceptance/30_generic_methods/unsafe/service_start.cf b/tests/acceptance/30_generic_methods/unsafe/service_start.cf
@@ -22,8 +22,10 @@ body common control
 bundle agent init
 {
   vars:
-    !aix::
+    debian::
       "service_name"  string => "cron";
+    redhat::
+      "service_name"  string => "crond";
     aix::
       "service_name"  string => "syslogd";
 

diff --git a/tree/30_generic_methods/variable_string_from_math_expression.cf b/tree/30_generic_methods/variable_string_from_math_expression.cf
@@ -118,7 +118,7 @@ bundle agent variable_string_from_math_expression(variable_prefix, variable_name
       "args"              slist => { "${variable_prefix}", "${variable_name}", "${expression}", "${format}" };
 
       # define the variable within the variable_prefix namespace
-      "temp" string => eval("${expression}");
+      "temp" string => eval("${expression}", "math", "infix");
       "${variable_prefix}.${variable_name}" string => format("${format}", "${temp}");
 
   classes: