diff options
| author | Helen <helen@puppetlabs.com> | 2016-04-15 13:29:23 +0100 |
|---|---|---|
| committer | Helen <helen@puppetlabs.com> | 2016-04-15 13:29:23 +0100 |
| commit | d9f65387c99c99177f94075fc840e7c574e07417 (patch) | |
| tree | e2b1bf7362973650efdcac0a3be68df7d9bae8f6 /lib/puppet/parser/functions/hash.rb | |
| parent | 29961218a74bfdae96371c42a3c336e714c79a93 (diff) | |
| parent | 085035dccebbf27cf2bfd7f1d9101c746f5178a2 (diff) | |
Merge pull request #595 from tphoney/4.12.0_release
master to 4.12.x
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 |