diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/parser/scope.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 7a595872e..012d7a82a 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -312,6 +312,10 @@ module Puppet args[:classes] += nodeclasses if nodeclasses args[:parentnode] = parent if parent + + if nodeclasses or parent + args[:searched] = true + end end begin diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 317776055..8d5937217 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -349,7 +349,7 @@ module Puppet::Parser # If they've provided a name or a parent, we assume they're looking # for nodes. - if hash.include? :parentnode + if hash[:searched] # Specifying a parent node takes precedence, because it is assumed # that this node was found in a remote repository like ldap. gennode(hash) |