(MAINT) deprecate ntp_dirname function

The dirname function is part of stdlib 4.6 which is already depended upon.
puppetlabs · Aug 27, 2015 · f3907ff · f3907ff
1 parent cd29227
commit f3907ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/puppet/parser/functions/ntp_dirname.rb b/lib/puppet/parser/functions/ntp_dirname.rb
@@ -7,6 +7,8 @@ module Puppet::Parser::Functions
     raise(Puppet::ParseError, "ntp_dirname(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
+    warning("ntp_dirname(): this function is deprecated and will be removed at a later time.")
+
     path = arguments[0]
     return File.dirname(path)
   end

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -2,7 +2,7 @@
 class ntp::config inherits ntp {
 
   if $ntp::keys_enable {
-    $directory = ntp_dirname($ntp::keys_file)
+    $directory = dirname($ntp::keys_file)
     file { $directory:
       ensure => directory,
       owner  => 0,