I think it's better to raise an exception and die rather than silently

[dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 11d3e7dd2c0157a32e38c96e3ee72d9f9a6f8370..d7f3daea7c41e872c23d81188f4ecbef22a88195 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -53,7 +53,9 @@ module Puppet::Parser::Functions
         results['ldap'] << x
       end
     rescue LDAP::ResultError
+      raise Puppet::ParseError, "LDAP error"
     rescue RuntimeError
+      raise Puppet::ParseError, "No data returned from search"
     ensure
       ldap.unbind
     end