diff options
author | Bryan Jen <bryan.jen@gmail.com> | 2016-03-29 09:13:46 -0700 |
---|---|---|
committer | Bryan Jen <bryan.jen@gmail.com> | 2016-03-29 09:13:46 -0700 |
commit | c5486aba6284664ae87a65beaa011211c70ea03e (patch) | |
tree | 5c1a4ffc818b9a96bda68fdc07d0a4a81cbc01db /lib/puppet/parser/functions/hash.rb | |
parent | b63849c7865e4191e9df5a7651c16c072facee3d (diff) | |
parent | 0cea94a82ef277092897a03446f6e6fccba90d53 (diff) |
Merge pull request #586 from ffrank/dont_catch_exception
catch StandardError rather than the gratuitous Exception
Diffstat (limited to 'lib/puppet/parser/functions/hash.rb')
-rw-r--r-- | lib/puppet/parser/functions/hash.rb | 2 |
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 |