aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-12-07 22:59:58 -0500
committerMicah Anderson <micah@riseup.net>2010-12-07 22:59:58 -0500
commitef2ebdffd25937e841be079d3aa256570ac33196 (patch)
tree7dabd205e4489422dc7d5b6dd3149e2020e3e192
parent1c1ed0e352c69296ac2681246de24875572cd534 (diff)
downloadpuppet-apt-ef2ebdffd25937e841be079d3aa256570ac33196.tar.gz
puppet-apt-ef2ebdffd25937e841be079d3aa256570ac33196.tar.bz2
switch to archive name for lenny default preferences
the templates/Debian/preferences_lenny.erb file checked in with e2f80db7b76171e5945127e2fd42fb35043990fb contains pinning based on codename, which is not supported in lenny (see #433624 - if you look at the version graph, you see, "Fixed in version 0.7.21", and lenny has 0.7.20.2+lenny1.)
-rw-r--r--templates/Debian/preferences_lenny.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/Debian/preferences_lenny.erb b/templates/Debian/preferences_lenny.erb
index 3de7959..be8ecd8 100644
--- a/templates/Debian/preferences_lenny.erb
+++ b/templates/Debian/preferences_lenny.erb
@@ -1,6 +1,6 @@
Explanation: Debian <%= codename %>
Package: *
-Pin: release o=Debian,n=<%= codename %>
+Pin: release o=Debian,a=<%= release %>
Pin-Priority: 990
Explanation: Debian backports
@@ -8,14 +8,14 @@ Package: *
Pin: origin backports.debian.org
Pin-Priority: 200
-Explanation: Debian <%= next_codename %>
+Explanation: Debian <%= next_release %>
Package: *
-Pin: release o=Debian,n=<%= next_codename %>
+Pin: release o=Debian,a=<%= next_release %>
Pin-Priority: 2
Explanation: Debian sid
Package: *
-Pin: release o=Debian,n=sid
+Pin: release o=Debian,a=unstable
Pin-Priority: 1
Explanation: Debian fallback