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/Debian/preferences_lenny.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/Debian/preferences_lenny.erb')
| -rw-r--r-- | templates/Debian/preferences_lenny.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/Debian/preferences_lenny.erb b/templates/Debian/preferences_lenny.erb index fb80129..5c3c829 100644 --- a/templates/Debian/preferences_lenny.erb +++ b/templates/Debian/preferences_lenny.erb @@ -1,6 +1,6 @@ -Explanation: Debian <%= codename %> +Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %> Package: * -Pin: release o=Debian,a=<%= release %>,v=<%= release_version %>* +Pin: release o=Debian,a=<%= scope.lookupvar('apt::release') %>,v=<%= scope.lookupvar('apt::release_version') %>* Pin-Priority: 990 Explanation: Debian backports @@ -8,7 +8,7 @@ Package: * Pin: origin backports.debian.org Pin-Priority: 200 -Explanation: Debian <%= next_release %> +Explanation: Debian <%= next_release=scope.lookupvar('apt::next_release') %> Package: * Pin: release o=Debian,a=<%= next_release %> Pin-Priority: 2 |