X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fis_ip_address.rb;h=6ce993a3c2f2a5c69df44d0ce7b64d6ab7ca11ae;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=79ddb986cd097c435df22b7cbb4ae8d4b8c6ea39;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
index 79ddb986c..6ce993a3c 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
@@ -1,18 +1,18 @@
 #
 # is_ip_address.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:is_ip_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a valid IP address.
-    EOS
-  ) do |arguments|
+  newfunction(:is_ip_address, :type => :rvalue, :doc => <<-DOC
+    Returns true if the string passed to this function is a valid IP address.
+    DOC
+             ) do |arguments|
 
     require 'ipaddr'
 
-    function_deprecation([:is_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function,
+                           with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
 
-    if (arguments.size != 1) then
+    if arguments.size != 1
       raise(Puppet::ParseError, "is_ip_address(): Wrong number of arguments given #{arguments.size} for 1")
     end
 
@@ -22,11 +22,8 @@ Returns true if the string passed to this function is a valid IP address.
       return false
     end
 
-    if ip.ipv4? or ip.ipv6? then
-      return true
-    else
-      return false
-    end
+    return true if ip.ipv4? || ip.ipv6?
+    return false
   end
 end