projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update puppetlabs/stdlib module
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
puppet
/
parser
/
functions
/
is_mac_address.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
index
5993ed2
..
597c928
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
@@
-1,25
+1,21
@@
#
# is_mac_address.rb
#
#
# is_mac_address.rb
#
-
module Puppet::Parser::Functions
module Puppet::Parser::Functions
- newfunction(:is_mac_address, :type => :rvalue, :doc => <<-
EOS
-Returns true if the string passed to this function is a valid mac address.
- EOS
- ) do |arguments|
+ newfunction(:is_mac_address, :type => :rvalue, :doc => <<-
DOC
+
Returns true if the string passed to this function is a valid mac address.
+ DOC
+
) do |arguments|
- if
(arguments.size != 1) then
+ if
arguments.size != 1
raise(Puppet::ParseError, "is_mac_address(): Wrong number of arguments given #{arguments.size} for 1")
end
mac = arguments[0]
raise(Puppet::ParseError, "is_mac_address(): Wrong number of arguments given #{arguments.size} for 1")
end
mac = arguments[0]
- if /^[a-f0-9]{1,2}(:[a-f0-9]{1,2}){5}$/i.match(mac) then
- return true
- else
- return false
- end
-
+ return true if %r{^[a-f0-9]{1,2}(:[a-f0-9]{1,2}){5}$}i =~ mac
+ return true if %r{^[a-f0-9]{1,2}(:[a-f0-9]{1,2}){19}$}i =~ mac
+ return false
end
end
end
end