aboutsummaryrefslogtreecommitdiff
path: root/templates/Debian/preferences_squeeze.erb
diff options
context:
space:
mode:
authorroot <root@puppet.nadir.org>2011-02-16 13:23:54 +0000
committerroot <root@puppet.nadir.org>2011-02-16 13:23:54 +0000
commit13033f7d814fe6c006d47108b5df5e0505975010 (patch)
tree733eafc4279e0c621b620a335f550d616402419e /templates/Debian/preferences_squeeze.erb
parent44c6d6aa8f394b0acf72a26ebb185595fe451159 (diff)
parent840ea9ed9d3e0a26e5a70db2143ebb3f0fea13b4 (diff)
downloadpuppet-apt-13033f7d814fe6c006d47108b5df5e0505975010.tar.gz
puppet-apt-13033f7d814fe6c006d47108b5df5e0505975010.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'templates/Debian/preferences_squeeze.erb')
-rw-r--r--templates/Debian/preferences_squeeze.erb9
1 files changed, 7 insertions, 2 deletions
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb
index f21562d..5e15d27 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences_squeeze.erb
@@ -3,14 +3,19 @@ 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 backports
Package: *
Pin: origin backports.debian.org
Pin-Priority: 200
-Explanation: Debian wheezy
+Explanation: Debian <%= next_codename %>
Package: *
-Pin: release o=Debian,n=wheezy
+Pin: release o=Debian,n=<%= next_codename %>
Pin-Priority: 2
Explanation: Debian sid