diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
| commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
| tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /templates/Ubuntu/preferences_maverick.erb | |
| parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
| parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
| download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
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 |