Make apt::preferences_snippet support Puppet < 2.7 again, when the 'package' paramete...

Details:
  https://labs.riseup.net/code/issues/3467
  https://labs.riseup.net/code/issues/3468

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index e00c4d1e5e3a6ac91d7cd34fff0294671d1f7af1..6a8e6bc8bbdb2acad5c610b67d37ee91e8c88417 100644 (file)
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -1,5 +1,5 @@
 define apt::preferences_snippet(
-  $package = $name,
+  $package = false,
   $ensure = 'present',
   $source = '',
   $release = '',
@@ -7,6 +7,11 @@ define apt::preferences_snippet(
   $priority )
 {
 
+  $real_package = $package ? {
+    false   => $name,
+    default => $package,
+  }
+
   if $custom_preferences == false {
     fail("Trying to define a preferences_snippet with \$custom_preferences set to false.")
   }

diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb
index fd15ce64a3af21ad66291d0208c803dfdba9cb99..b7acaab24481e5297f1724fcf2cbaaf897bfa468 100644 (file)
--- a/templates/preferences_snippet.erb
+++ b/templates/preferences_snippet.erb
@@ -1,4 +1,4 @@
-Package: <%= package %>
+Package: <%= real_package %>
 Pin: <%= pin %>
 Pin-Priority: <%= priority %>
 

diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb
index 0c4e136ddc7c0d09d3be86f639ec612d1d205b52..845d23f8b7f78388638de9a93063c38eba1ca7b7 100644 (file)
--- a/templates/preferences_snippet_release.erb
+++ b/templates/preferences_snippet_release.erb
@@ -1,4 +1,4 @@
-Package: <%= package %>
+Package: <%= real_package %>
 Pin: release a=<%= release %>
 Pin-Priority: <%= priority %>