diff options
| author | David Schmitt <david.schmitt@puppet.com> | 2016-09-26 17:12:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 17:12:35 +0100 |
| commit | 96af506f244f37626dc314907817665bfa6b4320 (patch) | |
| tree | 80f0f362c9c3ec12d0951de47227a7641da3f8bc /lib | |
| parent | 80daf167239d00fdbce38c6f0c86bf8958134368 (diff) | |
| parent | 02fc7f8e4912e0def8e6717c4de38a951bf4b741 (diff) | |
Merge pull request #657 from HelenCampbell/dupRemoval
Remove duplicate deprecation warnings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/functions/validate_absolute_path.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/validate_bool.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb index d5f5443..15b5c57 100644 --- a/lib/puppet/parser/functions/validate_absolute_path.rb +++ b/lib/puppet/parser/functions/validate_absolute_path.rb @@ -26,7 +26,8 @@ module Puppet::Parser::Functions ENDHEREDOC - function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.']) + # The deprecation function was being called twice, as validate_absolute_path calls is_absolute_path. I have removed it from here so it only calls deprecation once within is_absolute_path. + # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.']) require 'puppet/util' diff --git a/lib/puppet/parser/functions/validate_bool.rb b/lib/puppet/parser/functions/validate_bool.rb index 4e52ffd..e4345eb 100644 --- a/lib/puppet/parser/functions/validate_bool.rb +++ b/lib/puppet/parser/functions/validate_bool.rb @@ -19,7 +19,8 @@ module Puppet::Parser::Functions ENDHEREDOC - function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.']) + # The deprecation function was being called twice, as validate_bool calls is_bool. I have removed it from here so it only calls deprecation once within is_bool. + # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.']) unless args.length > 0 then raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)") |