3 files changed, 28 insertions, 19 deletions

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 3b84ae5..30aeb1d 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,5 +1,4 @@
 # 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
@@ -9,13 +8,16 @@ 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
-      fail("deprecation. #{key}. #{message}")
+      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+      fail("deprecation. #{key}. #{err_message}")
     else
-      Puppet.warn_once('deprecation', key, message)
+      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+      Puppet.deprecation_warning(err_message, key)
     end
   end
 end
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 9d7d012..0ba6dd8 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -2,46 +2,49 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
   # The function checks a value against both the target_type (new) and the previous_validation function (old).
 
   dispatch :validate_legacy do
+    scope_param
     param 'Type', :target_type
-    param 'String', :previous_validation
-    param 'NotUndef', :value
-    optional_param 'Any', :args
+    param 'String', :function_name
+    param 'Any', :value
+    optional_repeated_param 'Any', :args
   end
+
   dispatch :validate_legacy_s do
     scope_param
     param 'String', :type_string
-    param 'String', :previous_validation
-    param 'NotUndef', :value
+    param 'String', :function_name
+    param 'Any', :value
     optional_repeated_param 'Any', :args
   end
 
   def validate_legacy_s(scope, type_string, *args)
     t = Puppet::Pops::Types::TypeParser.new.parse(type_string, scope)
-    validate_legacy(t, *args)
+    validate_legacy(scope, t, *args)
   end
 
-  def validate_legacy(target_type, previous_validation, value, *prev_args)
+  def validate_legacy(scope, target_type, function_name, value, *prev_args)
     if assert_type(target_type, value)
-      if previous_validation(previous_validation, value, *prev_args)
+      if previous_validation(scope, function_name, value, *prev_args)
         # Silently passes
       else
-        Puppet.warn("Accepting previously invalid value for target_type '#{target_type}'")
+        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(previous_validation, target_type, inferred_type)
-      if previous_validation(previous_validation, value, *prev_args)
-        Puppet.warn(error_msg)
+      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name}) [#{caller_infos[0]}:#{caller_infos[1]}]", target_type, inferred_type)
+      if previous_validation(scope, function_name, value, *prev_args)
+        call_function('deprecation', 'validate_legacy', error_msg)
       else
         call_function('fail', error_msg)
       end
     end
   end
 
-  def previous_validation(previous_validation, value, *prev_args)
+  def previous_validation(scope, function_name, value, *prev_args)
     # Call the previous validation function and catch any errors. Return true if no errors are thrown.
     begin
-      call_function(previous_validation, value, *prev_args)
+      scope.send("function_#{function_name}".to_s, [value, *prev_args])
       true
     rescue Puppet::ParseError
       false
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index fc861a6..0cb247d 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -9,7 +9,11 @@ EOS
 
     key = arguments[0]
     message = arguments[1]
-
-    warning("deprecation. #{key}. #{message}")
+    
+    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}")
+    end
   end
 end