From 2e4d22ddd948b6d6f1532654e3dea53fa4b9f7d1 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
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_release.erb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 templates/preferences_snippet_release.erb

(limited to 'templates/preferences_snippet_release.erb')

diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb
new file mode 100644
index 0000000..0c4e136
--- /dev/null
+++ b/templates/preferences_snippet_release.erb
@@ -0,0 +1,4 @@
+Package: <%= package %>
+Pin: release a=<%= release %>
+Pin-Priority: <%= priority %>
+
-- 
cgit v1.2.3


From 02bd3269948f1a3c5a586e581a7fec22da69a2cc Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
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
---
 manifests/preferences_snippet.pp          | 7 ++++++-
 templates/preferences_snippet.erb         | 2 +-
 templates/preferences_snippet_release.erb | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'templates/preferences_snippet_release.erb')

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index e00c4d1..6a8e6bc 100644
--- 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 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 %>
 
diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb
index 0c4e136..845d23f 100644
--- 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 %>
 
-- 
cgit v1.2.3