diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-05 19:24:44 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-05 19:24:44 +0000 |
| commit | 06a7d345bef7a41cb6320e14a1dd9476505fd65f (patch) | |
| tree | 7a30b6db252c332321d5f52a1d5b0e9ca9064831 /lib | |
| parent | 2489764b12031f20022d08e662ee3fa826a75b95 (diff) | |
| download | puppet-06a7d345bef7a41cb6320e14a1dd9476505fd65f.tar.gz puppet-06a7d345bef7a41cb6320e14a1dd9476505fd65f.tar.xz puppet-06a7d345bef7a41cb6320e14a1dd9476505fd65f.zip | |
Fixing ldap nodes -- they were always returning true because i was returning an empty array for missing nodes.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1733 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 111fe2ed3..60e449db6 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -438,6 +438,10 @@ class Puppet::Parser::Interpreter classes.flatten! + if classes.empty? + classes = nil + end + return parent, classes end @@ -605,7 +609,7 @@ class Puppet::Parser::Interpreter parent, classes = ldapsearch(node) if parent or classes args = {} - args[:classes] = classes if classes and ! classes.empty? + args[:classes] = classes if classes args[:parentnode] = parent if parent return gennode(node, args) else |
