diff options
| author | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
| commit | 066c08f8362d53f0f30897cb8710d11260c726ea (patch) | |
| tree | a6369eecd88bb731fe413d0bbc8af73d74d1f447 /lib/puppet/parser/functions/hash.rb | |
| parent | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff) | |
| parent | b65dd1f45d10e10e45455358aeabb29167990e2c (diff) | |
Merge remote-tracking branch 'origin/master' into leap_master
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 |