aboutsummaryrefslogtreecommitdiff
path: root/templates/Ubuntu/preferences_maverick.erb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-30 16:47:30 +0100
committervarac <varacanero@zeromail.org>2013-01-30 16:47:30 +0100
commit6c135ea7bc2ae9951154cf5471801469e3e3d581 (patch)
tree11edc63e26ce79f4e6ba2634d42c0796797f3236 /templates/Ubuntu/preferences_maverick.erb
parent92d2d7be5f99920c67245d02c1ce76288967db62 (diff)
parent14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff)
downloadpuppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.gz
puppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.bz2
Merge remote-tracking branch 'remotes/shared/master'
Diffstat (limited to 'templates/Ubuntu/preferences_maverick.erb')
-rw-r--r--templates/Ubuntu/preferences_maverick.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Ubuntu/preferences_maverick.erb b/templates/Ubuntu/preferences_maverick.erb
index 30d3ec6..801ddd4 100644
--- a/templates/Ubuntu/preferences_maverick.erb
+++ b/templates/Ubuntu/preferences_maverick.erb
@@ -1,4 +1,4 @@
-Explanation: Ubuntu <%= codename %> security
+Explanation: Ubuntu <%= codename=scope.lookupvar('apt::codename') %> security
Package: *
Pin: release o=Ubuntu,a=<%= codename %>-security
Pin-Priority: 990
@@ -18,7 +18,7 @@ Package: *
Pin: release a=<%= codename %>-backports
Pin-Priority: 200
-Explanation: Ubuntu <%= next_release %>
+Explanation: Ubuntu <%= next_release=scope.lookupvar('apt::next_release') %>
Package: *
Pin: release o=Ubuntu,a=<%= next_release %>
Pin-Priority: 2