From a1f2620e898be82f36a51753d35ad84c547f556e Mon Sep 17 00:00:00 2001 From: "Francois @fanf42 Armand" Date: Wed, 29 Apr 2020 18:50:20 +0200 Subject: [PATCH] Work in progress --- .../policy-generation-finished/50-reload-policy-file-server | 0 .../hooks.d/policy-generation-node-ready/90-change-perm | 0 .../rudder/services/policies/InterpolatedValueCompiler.scala | 4 +--- 3 files changed, 1 insertion(+), 3 deletions(-) mode change 100755 => 100644 webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-finished/50-reload-policy-file-server mode change 100755 => 100644 webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-node-ready/90-change-perm diff --git a/webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-finished/50-reload-policy-file-server b/webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-finished/50-reload-policy-file-server old mode 100755 new mode 100644 diff --git a/webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-node-ready/90-change-perm b/webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-node-ready/90-change-perm old mode 100755 new mode 100644 diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala index 091f883416e..59a59252d06 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala @@ -47,8 +47,6 @@ import com.normation.rudder.services.policies.PropertyParserTokens._ import net.liftweb.common._ import net.liftweb.json.JsonAST.JValue -import scala.util.parsing.combinator.RegexParsers - /** * A parser that handle parameterized value of * directive variables. @@ -180,7 +178,7 @@ object PropertyParserTokens { final case class DefaultValue(value: List[Token]) extends AnyVal with PropertyOption def containsVariable(tokens: List[Token]): Boolean = { - tokens.exists(_.isInstanceOf[Interpolation]) + tokens.exists(t => t.isInstanceOf[Interpolation] || t.isInstanceOf[NonRudderVar]) } }