diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
commit | e4d777e5ec333c819a6b87b5c0186f67e86361ee (patch) | |
tree | b36957b74b417e68e9c09bf5300957d2e9f4857e /templates/Ubuntu/preferences_maverick.erb | |
parent | cc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff) | |
parent | 3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 (diff) | |
download | puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.gz puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.bz2 |
Fix merge conflict in README
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 801ddd4..8e5481d 100644 --- a/templates/Ubuntu/preferences_maverick.erb +++ b/templates/Ubuntu/preferences_maverick.erb @@ -1,4 +1,4 @@ -Explanation: Ubuntu <%= codename=scope.lookupvar('apt::codename') %> security +Explanation: Ubuntu <%= codename=scope.lookupvar('::ubuntu_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=scope.lookupvar('apt::next_release') %> +Explanation: Ubuntu <%= next_release=scope.lookupvar('::ubuntu_nextcodename') %> Package: * Pin: release o=Ubuntu,a=<%= next_release %> Pin-Priority: 2 |