07a031f205
What happened here was the $codename = $::lsbdistcodename was removed from
init.pp and replaced with just $::lsbdistcodename whereever $codename was
used. Then in the sources.list.erb and preferences files things were changed
like this:
<pre>+### Debian current: <%= codename = scope.lookupvar('::lsbdistcodename') %>
...
-deb <%= debian_url %> <%= codename %> <%= repos %>
...
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= repos=scope.lookupvar('apt::repos') %>
</pre>
This meant that the codename was always set to lsbdistcodename, and you because
in newer puppet versions you cannot assign a value to a top-level facter
variable, it is not possible to change this.
Because we cannot change $lsbdistcodename, we have to fix this by allowing the
user to pass a different, non-top-level scoped variable to the class as a
parameter, which defaults to $::lsbdistcodename, so that upgrades can be
triggered.
This is documented in the README in an upgrade notice
88 lines
3.1 KiB
Text
88 lines
3.1 KiB
Text
# This file is managed by puppet
|
|
# all local modifications will be overwritten
|
|
|
|
### Debian current: <%= codename=scope.lookupvar('apt::codename') %>
|
|
|
|
# basic
|
|
deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
|
|
<% if scope.lookupvar('apt::include_src') -%>
|
|
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 -%>
|
|
deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
|
|
<% if include_src -%>
|
|
deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
|
|
<% end -%>
|
|
<% end -%>
|
|
|
|
# backports
|
|
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
|
|
# There is no backports archive for <%= release %>
|
|
<% else -%>
|
|
deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
|
|
<% if include_src -%>
|
|
deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
|
|
<% end -%>
|
|
<% end -%>
|
|
|
|
<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
|
|
# volatile
|
|
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
|
|
# There is no volatile archive for <%= release %>
|
|
<% else -%>
|
|
<% if (codename == "lenny" || codename == "etch") -%>
|
|
deb <%= volatile_url=scope.lookupvar('apt::volatile_url') %> <%= codename %>/volatile <%= lrepos %>
|
|
<% if include_src -%>
|
|
deb-src <%= volatile_url %> <%= codename %>/volatile <%= lrepos %>
|
|
<% end -%>
|
|
<% else -%>
|
|
deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
|
|
<% if include_src -%>
|
|
deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
|
|
<% end -%>
|
|
<% end -%>
|
|
<% end -%>
|
|
<% end -%>
|
|
|
|
<% if next_release=scope.lookupvar('apt::use_next_release') -%>
|
|
### Debian next: <%= next_codename=scope.lookupvar('apt::next_codename') %>
|
|
|
|
# basic
|
|
deb <%= debian_url %> <%= next_codename %> <%= lrepos %>
|
|
<% if include_src then -%>
|
|
deb-src <%= debian_url %> <%= next_codename %> <%= lrepos %>
|
|
<% end -%>
|
|
|
|
# security
|
|
<% if (next_release == "unstable" || next_release == "experimental") -%>
|
|
# There is no security support for <%= next_release %>
|
|
<% else -%>
|
|
deb <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
|
|
<% if include_src then -%>
|
|
deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
|
|
<% end -%>
|
|
<% end -%>
|
|
|
|
<% if use_volatile -%>
|
|
# volatile
|
|
<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
|
|
# There is no volatile archive for <%= next_release %>
|
|
<% else -%>
|
|
<% if (next_codename == "lenny" || next_codename == "etch") -%>
|
|
deb <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
|
|
<% if include_src then -%>
|
|
deb-src <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
|
|
<% end -%>
|
|
<% else -%>
|
|
deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
|
|
<% if include_src then -%>
|
|
deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
|
|
<% end -%>
|
|
<% end -%>
|
|
<% end -%>
|
|
<% end -%>
|
|
<% end -%>
|