Skip to content

Commit 91847ca

Browse files
authored
Revert "Call site output for deprecation warnings"
1 parent 3762f30 commit 91847ca

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

lib/puppet/functions/deprecation.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88
end
99

1010
def deprecation(key, message)
11-
stacktrace = Puppet::Pops::PuppetStack.stacktrace()
12-
file = stacktrace[0]
13-
line = stacktrace[1]
14-
output_message = "#{message} at #{file}:#{line}"
1511
# depending on configuration setting of strict
1612
case Puppet.settings[:strict]
1713
when :off
1814
# do nothing
1915
when :error
20-
fail("deprecation. #{key}. #{output_message}")
16+
fail("deprecation. #{key}. #{message}")
2117
else
2218
unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
23-
Puppet.deprecation_warning(output_message, key)
19+
Puppet.deprecation_warning(message, key)
2420
end
2521
end
2622
end

spec/acceptance/deprecation_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
end
3232

3333
it "should show the error message" do
34-
expect(@result.stderr).to match(/deprecation. key. message at/)
34+
expect(@result.stderr).to match(/deprecation. key. message/)
3535
end
3636

3737
describe file("#{test_file}") do
@@ -53,7 +53,7 @@
5353
end
5454

5555
it "should show the error message" do
56-
expect(@result.stderr).to match(/Warning: message at /)
56+
expect(@result.stderr).to match(/Warning: message/)
5757
end
5858

5959
describe file("#{test_file}") do

0 commit comments

Comments
 (0)