Merge pull request #668 from DavidS/final-cleanups

Final cleanups

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 30aeb1d..a860aa2 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,15 @@ 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)
+      unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
+        Puppet.deprecation_warning(message, key)
+      end
     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