diff options
| author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
| commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
| tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /templates/Debian/preferences_lenny.erb | |
| parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
| parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
| download | puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2 | |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.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 |