From 71305efaf9ee58f3e4edbafb148dd01a022df706 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Sun, 27 Nov 2016 17:03:26 +0000
Subject: [PATCH] Use the stdlib deprecation() function

---
 manifests/key.pp    | 10 +++++-----
 manifests/source.pp | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/key.pp b/manifests/key.pp
index 914ec88..148a751 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -14,35 +14,35 @@ define apt::key (
 ) {
 
   if $key != undef {
-    warning('$key is deprecated and will be removed in the next major release. Please use $id instead.')
+    deprecation('apt $key', '$key is deprecated and will be removed in the next major release. Please use $id instead.')
     $_id = $key
   } else {
     $_id = $id
   }
 
   if $key_content != undef {
-    warning('$key_content is deprecated and will be removed in the next major release. Please use $content instead.')
+    deprecation('apt $key_content', '$key_content is deprecated and will be removed in the next major release. Please use $content instead.')
     $_content = $key_content
   } else {
     $_content = $content
   }
 
   if $key_source != undef {
-    warning('$key_source is deprecated and will be removed in the next major release. Please use $source instead.')
+    deprecation('apt $key_source', '$key_source is deprecated and will be removed in the next major release. Please use $source instead.')
     $_source = $key_source
   } else {
     $_source = $source
   }
 
   if $key_server != undef {
-    warning('$key_server is deprecated and will be removed in the next major release. Please use $server instead.')
+    deprecation('apt $key_server', '$key_server is deprecated and will be removed in the next major release. Please use $server instead.')
     $_server = $key_server
   } else {
     $_server = $server
   }
 
   if $key_options != undef {
-    warning('$key_options is deprecated and will be removed in the next major release. Please use $options instead.')
+    deprecation('apt $key_options', '$key_options is deprecated and will be removed in the next major release. Please use $options instead.')
     $_options = $key_options
   } else {
     $_options = $options
diff --git a/manifests/source.pp b/manifests/source.pp
index 9adf6a2..a189c5f 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -30,15 +30,15 @@ define apt::source(
   $_before = Apt::Setting["list-${title}"]
 
   if $include_src != undef {
-    warning("\$include_src is deprecated and will be removed in the next major release, please use \$include => { 'src' => ${include_src} } instead")
+    deprecation('apt $include_src', "\$include_src is deprecated and will be removed in the next major release, please use \$include => { 'src' => ${include_src} } instead")
   }
 
   if $include_deb != undef {
-    warning("\$include_deb is deprecated and will be removed in the next major release, please use \$include => { 'deb' => ${include_deb} } instead")
+    deprecation('apt $include_deb', "\$include_deb is deprecated and will be removed in the next major release, please use \$include => { 'deb' => ${include_deb} } instead")
   }
 
   if $required_packages != undef {
-    warning('$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
+    deprecation('apt $required_packages', '$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
     exec { "Required packages: '${required_packages}' for ${name}":
       command     => "${::apt::params::provider} -y install ${required_packages}",
       logoutput   => 'on_failure',
@@ -50,19 +50,19 @@ define apt::source(
   }
 
   if $key_server != undef {
-    warning("\$key_server is deprecated and will be removed in the next major release, please use \$key => { 'server' => ${key_server} } instead.")
+    deprecation('apt $key_server', "\$key_server is deprecated and will be removed in the next major release, please use \$key => { 'server' => ${key_server} } instead.")
   }
 
   if $key_content != undef {
-    warning("\$key_content is deprecated and will be removed in the next major release, please use \$key => { 'content' => ${key_content} } instead.")
+    deprecation('apt $key_content', "\$key_content is deprecated and will be removed in the next major release, please use \$key => { 'content' => ${key_content} } instead.")
   }
 
   if $key_source != undef {
-    warning("\$key_source is deprecated and will be removed in the next major release, please use \$key => { 'source' => ${key_source} } instead.")
+    deprecation('apt $key_source', "\$key_source is deprecated and will be removed in the next major release, please use \$key => { 'source' => ${key_source} } instead.")
   }
 
   if $trusted_source != undef {
-    warning('$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
+    deprecation('apt $trusted_source', '$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
     $_allow_unsigned = $trusted_source
   } else {
     $_allow_unsigned = $allow_unsigned
-- 
2.32.3