summaryrefslogtreecommitdiffstats
path: root/lib/puppet/type
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/type')
-rw-r--r--lib/puppet/type/macauthorization.rb4
-rw-r--r--lib/puppet/type/resources.rb4
-rw-r--r--lib/puppet/type/zone.rb4
3 files changed, 3 insertions, 9 deletions
diff --git a/lib/puppet/type/macauthorization.rb b/lib/puppet/type/macauthorization.rb
index ff87d3a57..5fe64fabe 100644
--- a/lib/puppet/type/macauthorization.rb
+++ b/lib/puppet/type/macauthorization.rb
@@ -22,11 +22,9 @@ Puppet::Type.newtype(:macauthorization) do
end
def munge_integer(value)
- begin
Integer(value)
- rescue ArgumentError
+ rescue ArgumentError
fail("munge_integer only takes integers")
- end
end
newparam(:name) do
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index 2960998c9..fc7109c38 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -78,12 +78,10 @@ Puppet::Type.newtype(:resources) do
end
def able_to_ensure_absent?(resource)
- begin
resource[:ensure] = :absent
- rescue ArgumentError, Puppet::Error => detail
+ rescue ArgumentError, Puppet::Error => detail
err "The 'ensure' attribute on #{self[:name]} resources does not accept 'absent' as a value"
false
- end
end
# Generate any new resources we need to manage. This is pretty hackish
diff --git a/lib/puppet/type/zone.rb b/lib/puppet/type/zone.rb
index e853efcae..a60706bb8 100644
--- a/lib/puppet/type/zone.rb
+++ b/lib/puppet/type/zone.rb
@@ -387,11 +387,9 @@ Puppet::Type.newtype(:zone) do
end
def validate_ip(ip, name)
- begin
IPAddr.new(ip) if ip
- rescue ArgumentError
+ rescue ArgumentError
self.fail "'#{ip}' is an invalid #{name}"
- end
end
validate do