diff options
| author | Micah <micah@riseup.net> | 2014-12-06 15:47:59 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2014-12-06 15:47:59 +0000 |
| commit | 93858f31f0bf3f29277802058fd07f6e3801492b (patch) | |
| tree | b4537d79bd73a1c082a5d890c6e1d31a9c5ff817 | |
| parent | 5a8d214529429b5dd898e0df29d69e0acf5271df (diff) | |
| parent | 671610fab54d6cc65f59143fe1cd6c992d3e48d8 (diff) | |
| download | puppet-apt-93858f31f0bf3f29277802058fd07f6e3801492b.tar.gz puppet-apt-93858f31f0bf3f29277802058fd07f6e3801492b.tar.bz2 | |
Merge branch 'flip_security_source' into 'master'
Flip security source
Implement bug #8334
the diff in the redmine issue has two checks for codenames, but I'm wondering if they're adding anything to the "releases" check.
See merge request !1
| -rw-r--r-- | templates/Debian/sources.list.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 65b5945..00f3618 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -10,13 +10,13 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> # security -<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental") -%> -# There is no security support for <%= release %> -<% else -%> +<% if ((release=scope.lookupvar('apt::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 %> <% end -%> +<% else -%> +# There is no security support for <%= release %> <% end -%> # backports |