summaryrefslogtreecommitdiff
path: root/lib/puppet/functions/validate_legacy.rb
diff options
context:
space:
mode:
authorDavid Schmitt <david@black.co.at>2016-10-08 18:10:53 +0100
committerDavid Schmitt <david@black.co.at>2016-10-08 18:10:53 +0100
commite44238a9c7da7ad4a872ba86cd103becadd51b3b (patch)
tree0fe8acbdcfb62cdba929923df0e2a0b0b1dca6f0 /lib/puppet/functions/validate_legacy.rb
parent9debb12b2d6190045a11d2277c7b730ac5732f96 (diff)
Revert "Addition of logging with file and line numbers"
This reverts commit b63862ff43194194f7428739a32cfe13bad1e7ed, as it would only show the irrelevant first entry of the ruby stack trace. The puppetserver log does contain the full trace information, or you can use --strict=error to cause a hard failure when hitting a deprecation. # Conflicts: # lib/puppet/functions/validate_legacy.rb
Diffstat (limited to 'lib/puppet/functions/validate_legacy.rb')
-rw-r--r--lib/puppet/functions/validate_legacy.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 0ba6dd8..3f50459 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -30,9 +30,8 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
Puppet.notice("Accepting previously invalid value for target type '#{target_type}'")
end
else
- caller_infos = caller.first.split(":")
inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
- error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name}) [#{caller_infos[0]}:#{caller_infos[1]}]", target_type, inferred_type)
+ error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name})", target_type, inferred_type)
if previous_validation(scope, function_name, value, *prev_args)
call_function('deprecation', 'validate_legacy', error_msg)
else