aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-06-08 18:18:50 +0200
committerintrigeri <intrigeri@boum.org>2012-06-08 18:18:50 +0200
commit13a0b4484fc85be0821f0b72c11c9487c890b546 (patch)
tree6c3cf16d8b7318198235927c4ffcb03f4cfc6a04
parent0cb3cd816e37a81ffc89e68b774d34930c5acc36 (diff)
downloadpuppet-apt-13a0b4484fc85be0821f0b72c11c9487c890b546.tar.gz
puppet-apt-13a0b4484fc85be0821f0b72c11c9487c890b546.tar.bz2
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.
-rw-r--r--README7
-rw-r--r--manifests/preferences_snippet.pp1
-rw-r--r--templates/preferences_snippet.erb2
3 files changed, 9 insertions, 1 deletions
diff --git a/README b/README
index bdb8185..82d216a 100644
--- 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 91b3dde..908ca73 100644
--- 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 4dfb701..0c4e136 100644
--- 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 %>