From 13a0b4484fc85be0821f0b72c11c9487c890b546 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 8 Jun 2012 18:18:50 +0200 Subject: 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. --- templates/preferences_snippet.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/preferences_snippet.erb') 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 %> -- cgit v1.2.3 From 2e4d22ddd948b6d6f1532654e3dea53fa4b9f7d1 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 8 Jun 2012 18:30:23 +0200 Subject: Allow passing arbitrary Pin value to apt::preferences_snippet. Closes: Redmine#3467. --- templates/preferences_snippet.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/preferences_snippet.erb') diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb index 0c4e136..fd15ce6 100644 --- a/templates/preferences_snippet.erb +++ b/templates/preferences_snippet.erb @@ -1,4 +1,4 @@ Package: <%= package %> -Pin: release a=<%= release %> +Pin: <%= pin %> Pin-Priority: <%= priority %> -- cgit v1.2.3 From 02bd3269948f1a3c5a586e581a7fec22da69a2cc Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 18 Jun 2012 22:57:13 +0200 Subject: Make apt::preferences_snippet support Puppet < 2.7 again, when the 'package' parameter is not set. Details: https://labs.riseup.net/code/issues/3467 https://labs.riseup.net/code/issues/3468 --- templates/preferences_snippet.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/preferences_snippet.erb') diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb index fd15ce6..b7acaab 100644 --- a/templates/preferences_snippet.erb +++ b/templates/preferences_snippet.erb @@ -1,4 +1,4 @@ -Package: <%= package %> +Package: <%= real_package %> Pin: <%= pin %> Pin-Priority: <%= priority %> -- cgit v1.2.3