X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Ffunctions%2Fdeprecation.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Ffunctions%2Fdeprecation.rb;h=af6109d9de73d6f7060f76afb995e9e08e603fe1;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=39d9bc7fe9f86a3ea3c4763f844da7015c0c7844;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/functions/deprecation.rb b/3rdparty/modules/stdlib/lib/puppet/functions/deprecation.rb
index 39d9bc7fe..af6109d9d 100644
--- a/3rdparty/modules/stdlib/lib/puppet/functions/deprecation.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/functions/deprecation.rb
@@ -1,4 +1,7 @@
-# Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method  It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning)  *Type*: String, String.
+# Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once.
+# The msg is the message text including any positional information that is formatted by the user/caller of the method.
+# It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message),
+#   :off (no message / error is displayed) and :warning (default, outputs a warning)  *Type*: String, String.
 #
 
 Puppet::Functions.create_function(:deprecation) do
@@ -8,7 +11,7 @@ Puppet::Functions.create_function(:deprecation) do
   end
 
   def deprecation(key, message)
-    if defined? Puppet::Pops::PuppetStack.stacktrace()
+    if defined? Puppet::Pops::PuppetStack.stacktrace
       stacktrace = Puppet::Pops::PuppetStack.stacktrace()
       file = stacktrace[0]
       line = stacktrace[1]
@@ -16,10 +19,10 @@ Puppet::Functions.create_function(:deprecation) do
     end
     # depending on configuration setting of strict
     case Puppet.settings[:strict]
-    when :off
+    when :off # rubocop:disable Lint/EmptyWhen : Is required to prevent false errors
       # do nothing
     when :error
-      fail("deprecation. #{key}. #{message}")
+      raise("deprecation. #{key}. #{message}")
     else
       unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
         Puppet.deprecation_warning(message, key)