diff options
author | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
commit | e596bfb9306664ab4aef78bc05615904b7c6e7f2 (patch) | |
tree | d9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3 /templates/Ubuntu/preferences_maverick.erb | |
parent | 08b066db441375d1613d131767cb1c5bdd3bb60b (diff) | |
parent | d51e2af9d452731f63b2fe16391e9cd2ff9d640f (diff) | |
download | puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.gz puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.bz2 |
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp
Diffstat (limited to 'templates/Ubuntu/preferences_maverick.erb')
-rw-r--r-- | templates/Ubuntu/preferences_maverick.erb | 4 |
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 |