summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/node.rb')
-rw-r--r--lib/puppet/node.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index 47be43168..81d88d088 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -56,15 +56,13 @@ class Puppet::Node
# Merge the node facts with parameters from the node source.
def fact_merge
- begin
if facts = Puppet::Node::Facts.find(name)
merge(facts.values)
end
- rescue => detail
+ rescue => detail
error = Puppet::Error.new("Could not retrieve facts for #{name}: #{detail}")
error.set_backtrace(detail.backtrace)
raise error
- end
end
# Merge any random parameters into our parameter list.