Support multiple APT preferences snippets for the same package name pattern.

This is implemented by adding a "package" parameter to apt::preferences_snippet,
so that define names can be kept unique while the package names are
not necessarily.

Closes: Redmine#3468.

diff --git a/README b/README
index bdb818567d8218aa143a7d8670de792532936deb..82d216a5cff19b369816f18895b5d96c8829495a 100644 (file)
--- a/README
+++ b/README
@@ -314,6 +314,13 @@ Example:
       priority => 999;
   }
 
+  apt::preferences_snippet{
+    'unstable_fallback':
+      package => '*',
+      release => 'unstable',
+      priority => 1;
+  }
+
 apt::preseeded_package
 ----------------------
 

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 91b3dde64621b5e9c4c24ff77e81b100bb3948ed..908ca7344dfdfa839834d9d3e217106ddee3a6be 100644 (file)
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -1,4 +1,5 @@
 define apt::preferences_snippet(
+  $package = $name,
   $ensure = 'present',
   $source = '',
   $release,

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