Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/preseeded_package.pp
	manifests/unattended_upgrades.pp

1 files changed, 26 insertions, 3 deletions

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 91b3dde..6a8e6bc 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -1,14 +1,28 @@
 define apt::preferences_snippet(
+  $package = false,
   $ensure = 'present',
   $source = '',
-  $release,
+  $release = '',
+  $pin = '',
   $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.")
   }
 
+  if !$pin and !$release {
+    fail("apt::preferences_snippet requires one of the 'pin' or 'release' argument to be set")
+  }
+  if $pin and $release {
+    fail("apt::preferences_snippet requires either a 'pin' or 'release' argument, not both")
+  }
+
   include apt::preferences
 
   concat::fragment{"apt_preference_${name}":
@@ -21,8 +35,17 @@ define apt::preferences_snippet(
   # lenny, we can't generalize without going into ugly special-casing.
   case $source {
     '': {
-      Concat::Fragment["apt_preference_${name}"]{
-        content => template("apt/preferences_snippet.erb")
+      case $release {
+        '': {
+          Concat::Fragment["apt_preference_${name}"]{
+            content => template("apt/preferences_snippet.erb")
+          }
+        }
+        default: {
+          Concat::Fragment["apt_preference_${name}"]{
+            content => template("apt/preferences_snippet_release.erb")
+          }
+        }
       }
     }
     default: {