diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb index 7082068ec..a860aa262 100644 --- a/lib/puppet/functions/deprecation.rb +++ b/lib/puppet/functions/deprecation.rb @@ -8,19 +8,15 @@ end def deprecation(key, message) - stacktrace = Puppet::Pops::PuppetStack.stacktrace() - file = stacktrace[0] - line = stacktrace[1] - output_message = "#{message} at #{file}:#{line}" # depending on configuration setting of strict case Puppet.settings[:strict] when :off # do nothing when :error - fail("deprecation. #{key}. #{output_message}") + fail("deprecation. #{key}. #{message}") else unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false' - Puppet.deprecation_warning(output_message, key) + Puppet.deprecation_warning(message, key) end end end diff --git a/spec/acceptance/deprecation_spec.rb b/spec/acceptance/deprecation_spec.rb index 697c60479..ea137008a 100644 --- a/spec/acceptance/deprecation_spec.rb +++ b/spec/acceptance/deprecation_spec.rb @@ -31,7 +31,7 @@ end it "should show the error message" do - expect(@result.stderr).to match(/deprecation. key. message at/) + expect(@result.stderr).to match(/deprecation. key. message/) end describe file("#{test_file}") do @@ -53,7 +53,7 @@ end it "should show the error message" do - expect(@result.stderr).to match(/Warning: message at /) + expect(@result.stderr).to match(/Warning: message/) end describe file("#{test_file}") do