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/sources.list.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/sources.list.erb')
| -rw-r--r-- | templates/Debian/sources.list.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index ce43135..bde87ac 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -1,7 +1,7 @@ # This file is managed by puppet # all local modifications will be overwritten -### Debian current: <%= codename=scope.lookupvar('apt::codename') %> +### Debian current: <%= codename=scope.lookupvar('::debian_codename') %> # basic deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %> @@ -10,7 +10,7 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> # security -<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%> +<% if ((release=scope.lookupvar('::debian_release')) == "stable" || release == "oldstable") -%> deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %> <% if include_src -%> deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> @@ -45,7 +45,7 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %> <% if use_lts=scope.lookupvar('apt::use_lts') -%> # LTS -<% if release != "oldoldstable" -%> +<% if release_lts=scope.lookupvar('::debian_lts') == "false" -%> # There is no LTS archive for <%= release %> <% else -%> deb <%= debian_url %> <%= codename %>-lts <%= lrepos %> @@ -56,7 +56,7 @@ deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %> <% end -%> <% if next_release=scope.lookupvar('apt::use_next_release') -%> -### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %> +### Debian next: <%= next_release=scope.lookupvar('::debian_nextrelease') ; next_codename=scope.lookupvar('::debian_nextcodename') %> # basic deb <%= debian_url %> <%= next_codename %> <%= lrepos %> |