diff options
| author | Felix Frank <Felix.Frank@Alumni.TU-Berlin.de> | 2016-03-29 01:59:54 +0200 |
|---|---|---|
| committer | Felix Frank <Felix.Frank@Alumni.TU-Berlin.de> | 2016-03-29 01:59:54 +0200 |
| commit | 0cea94a82ef277092897a03446f6e6fccba90d53 (patch) | |
| tree | 5c1a4ffc818b9a96bda68fdc07d0a4a81cbc01db /lib/puppet/parser | |
| parent | b63849c7865e4191e9df5a7651c16c072facee3d (diff) | |
catch StandardError rather than the gratuitous Exception
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/functions/hash.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/parsejson.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/parseyaml.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/validate_cmd.rb | 2 |
4 files changed, 4 insertions, 4 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 diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb index b4af40e..f7c2896 100644 --- a/lib/puppet/parser/functions/parsejson.rb +++ b/lib/puppet/parser/functions/parsejson.rb @@ -15,7 +15,7 @@ be returned if the parsing of YAML string have failed. begin PSON::load(arguments[0]) || arguments[1] - rescue Exception => e + rescue StandardError => e if arguments[1] arguments[1] else diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb index 66d0413..9e84055 100644 --- a/lib/puppet/parser/functions/parseyaml.rb +++ b/lib/puppet/parser/functions/parseyaml.rb @@ -16,7 +16,7 @@ be returned if the parsing of YAML string have failed. begin YAML::load(arguments[0]) || arguments[1] - rescue Exception => e + rescue StandardError => e if arguments[1] arguments[1] else diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb index 5df3c60..685162b 100644 --- a/lib/puppet/parser/functions/validate_cmd.rb +++ b/lib/puppet/parser/functions/validate_cmd.rb @@ -53,7 +53,7 @@ module Puppet::Parser::Functions rescue Puppet::ExecutionFailure => detail msg += "\n#{detail}" raise Puppet::ParseError, msg - rescue Exception => detail + rescue StandardError => detail msg += "\n#{detail.class.name} #{detail}" raise Puppet::ParseError, msg ensure |