6 files changed, 13 insertions, 54 deletions
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
-
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 44eea53..c7318a2 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -4,7 +4,7 @@
 ### Debian current: <%= codename=scope.lookupvar('::debian_codename') %>
 
 # basic
-deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %>
 <% if include_src=scope.lookupvar('apt::include_src')  -%>
 deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index e6d2f64..b90b8c8 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -1,8 +1,8 @@
 # This file is managed by puppet
 # all local modifications will be overwritten
 
-# basic <%= codename=scope.lookupvar('::ubuntu_codename') %>
-deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+# basic <%= codename=scope.lookupvar('apt::codename') %>
+deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %>
 <% if include_src=scope.lookupvar('apt::include_src') -%>
 deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
 <% end -%>