Merge branch 'merge_debian_preferences_templates'

Conflicts:
	manifests/preferences.pp
	templates/Debian/preferences_jessie.erb
	templates/Debian/preferences_squeeze.erb
	templates/Debian/preferences_wheezy.erb

5 files changed, 15 insertions, 53 deletions

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 6982ca0..50ca23a 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -2,8 +2,11 @@ class apt::preferences {
 
   $pref_contents = $apt::custom_preferences ? {
     ''      => $::operatingsystem ? {
-      'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"),
-      'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"),
+      'debian' => $::debian_codename ? {
+        'lenny' => template("apt/${::operatingsystem}/preferences_lenny.erb"),
+        default => template("apt/${::operatingsystem}/preferences.erb"),
+      },
+      'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
     },
     default => $apt::custom_preferences
   }
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences.erb
index 885edc7..37cf80d 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences.erb
@@ -1,30 +1,33 @@
+# This file is managed by puppet
+# all local modifications will be overwritten
+
 Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= codename %>
 Pin-Priority: 990
 
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 Explanation: Debian <%= codename %>-updates
 Package: *
 Pin: release o=Debian,n=<%= codename %>-updates
 Pin-Priority: 990
+<%- end -%>
 
+<% if (use_lts=scope.lookupvar('apt::use_lts')) && (scope.lookupvar('::debian_lts') == "true") -%>
 Explanation: Debian <%= codename %>-lts
 Package: *
 Pin: release o=Debian,n=<%= codename %>-lts
 Pin-Priority: 990
+<%- end -%>
 
-Explanation: Debian <%= next_codename=scope.lookupvar('::debian_nextcodename') %>
+<% if (next_codename=scope.lookupvar('::debian_nextcodename')) && (next_codename != "experimental") -%>
+Explanation: Debian <%= next_codename %>
 Package: *
 Pin: release o=Debian,n=<%= next_codename %>
 Pin-Priority: 2
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
+<%- end -%>
 
 Explanation: Debian fallback
 Package: *
 Pin: release o=Debian
 Pin-Priority: -10
-
diff --git a/templates/Debian/preferences_jessie.erb b/templates/Debian/preferences_jessie.erb
deleted file mode 100644
index 0888abe..0000000
--- a/templates/Debian/preferences_jessie.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,n=<%= codename %>
-Pin-Priority: 990
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
diff --git a/templates/Debian/preferences_sid.erb b/templates/Debian/preferences_sid.erb
deleted file mode 100644
index eb18554..0000000
--- a/templates/Debian/preferences_sid.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 990
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-
diff --git a/templates/Debian/preferences_wheezy.erb b/templates/Debian/preferences_wheezy.erb
deleted file mode 100644
index 106108d..0000000
--- a/templates/Debian/preferences_wheezy.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,n=<%= codename %>
-Pin-Priority: 990
-
-Explanation: Debian <%= codename %>-updates
-Package: *
-Pin: release o=Debian,n=<%= codename %>-updates
-Pin-Priority: 990
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-