summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/hash.rb
diff options
context:
space:
mode:
authorFelix Frank <Felix.Frank@Alumni.TU-Berlin.de>2016-03-29 01:59:54 +0200
committerFelix Frank <Felix.Frank@Alumni.TU-Berlin.de>2016-03-29 01:59:54 +0200
commit0cea94a82ef277092897a03446f6e6fccba90d53 (patch)
tree5c1a4ffc818b9a96bda68fdc07d0a4a81cbc01db /lib/puppet/parser/functions/hash.rb
parentb63849c7865e4191e9df5a7651c16c072facee3d (diff)
catch StandardError rather than the gratuitous Exception
Diffstat (limited to 'lib/puppet/parser/functions/hash.rb')
-rw-r--r--lib/puppet/parser/functions/hash.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/hash.rb b/lib/puppet/parser/functions/hash.rb
index 8cc4823..89d0e07 100644
--- a/lib/puppet/parser/functions/hash.rb
+++ b/lib/puppet/parser/functions/hash.rb
@@ -29,7 +29,7 @@ Would return: {'a'=>1,'b'=>2,'c'=>3}
# This is to make it compatible with older version of Ruby ...
array = array.flatten
result = Hash[*array]
- rescue Exception
+ rescue StandardError
raise(Puppet::ParseError, 'hash(): Unable to compute ' +
'hash from array given')
end