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/Debian/preferences_squeeze.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/Debian/preferences_squeeze.erb')
| -rw-r--r-- | templates/Debian/preferences_squeeze.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index 838b3a1..885edc7 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -1,4 +1,4 @@ -Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %> +Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %> Package: * Pin: release o=Debian,n=<%= codename %> Pin-Priority: 990 @@ -13,7 +13,7 @@ Package: * Pin: release o=Debian,n=<%= codename %>-lts Pin-Priority: 990 -Explanation: Debian <%= next_codename=scope.lookupvar('apt::next_codename') %> +Explanation: Debian <%= next_codename=scope.lookupvar('::debian_nextcodename') %> Package: * Pin: release o=Debian,n=<%= next_codename %> Pin-Priority: 2 |