summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/functions/deprecation.rb8
-rw-r--r--lib/puppet/functions/validate_legacy.rb3
-rw-r--r--lib/puppet/parser/functions/deprecation.rb4
3 files changed, 5 insertions, 10 deletions
diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 30aeb1d..6b7b977 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,4 +1,5 @@
# 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
dispatch :deprecation do
@@ -8,16 +9,13 @@ Puppet::Functions.create_function(:deprecation) do
def deprecation(key, message)
# depending on configuration setting of strict
- caller_infos = caller.first.split(":")
case Puppet.settings[:strict]
when :off
# do nothing
when :error
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- fail("deprecation. #{key}. #{err_message}")
+ fail("deprecation. #{key}. #{message}")
else
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- Puppet.deprecation_warning(err_message, key)
+ Puppet.deprecation_warning(message, key)
end
end
end
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
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index 0cb247d..e30f3a0 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -11,9 +11,7 @@ EOS
message = arguments[1]
if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
- caller_infos = caller.first.split(":")
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- warning("deprecation. #{key}. #{err_message}")
+ warning("deprecation. #{key}. #{message}")
end
end
end