Work in progress

fanf · Apr 29, 2020 · a1f2620 · a1f2620
1 parent c68b43f
commit a1f2620
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/...r-core/src/main/resources/hooks.d/policy-generation-finished/50-reload-policy-file-server b/...r-core/src/main/resources/hooks.d/policy-generation-finished/50-reload-policy-file-server
diff --git a/...rudder/rudder-core/src/main/resources/hooks.d/policy-generation-node-ready/90-change-perm b/...rudder/rudder-core/src/main/resources/hooks.d/policy-generation-node-ready/90-change-perm
diff --git a/...ore/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala b/...ore/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])
   }
 
 }