apt::source: Merge `include_*` options into hash.
'source' => undef,
}
+ $include_defaults = {
+ 'deb' => true,
+ 'src' => false,
+ }
+
case $xfacts['lsbdistid'] {
'ubuntu', 'debian': {
$distid = $xfacts['lsbdistid']
$location = '',
$release = $::apt::xfacts['lsbdistcodename'],
$repos = 'main',
- $include_src = false,
- $include_deb = true,
+ $include = {},
$key = undef,
$pin = false,
$architecture = undef,
$trusted_source = false,
) {
validate_string($architecture, $comment, $location, $repos)
- validate_bool($trusted_source, $include_src, $include_deb)
+ validate_bool($trusted_source)
+ validate_hash($include)
unless $release {
fail('lsbdistcodename fact not available: release parameter required')
}
$_before = Apt::Setting["list-${title}"]
+ $_include = merge($::apt::include_defaults, $include)
if $key {
if is_hash($key) {
'repos' => 'main contrib non-free',
'key' => { 'id' => '55BE302B', 'server' => 'subkeys.pgp.net' },
'pin' => '-10',
- 'include_src' => true,
+ 'include' => {'src' => true,},
},
'puppetlabs' => {
'location' => 'http://apt.puppetlabs.com',
'my_source'
end
- context 'mostly defaults' do
+ context 'defaults' do
let :facts do
{
:lsbdistid => 'Debian',
}
end
- let :params do
- {
- :include_deb => false,
- :include_src => true,
- }
- end
-
it { is_expected.to contain_apt__setting('list-my_source').with({
- :ensure => 'present',
- }).with_content(/# my_source\ndeb-src wheezy main\n/)
-
+ :ensure => 'present',
+ }).without_content(/# my_source\ndeb-src wheezy main\n/)
}
end
:location => 'http://debian.mirror.iweb.ca/debian/',
:release => 'sid',
:repos => 'testing',
- :include_src => false,
:key => GPG_KEY_ID,
:pin => '10',
:architecture => 'x86_64',
:location => 'http://debian.mirror.iweb.ca/debian/',
:release => 'sid',
:repos => 'testing',
- :include_src => false,
:key => { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
'content' => 'GPG key content',
'source' => 'http://apt.puppetlabs.com/pubkey.gpg',},
:location => 'http://debian.mirror.iweb.ca/debian/',
:release => 'sid',
:repos => 'testing',
- :include_src => false,
:key => GPG_KEY_ID,
:pin => '10',
:architecture => 'x86_64',
end
let :params do
{
- :include_src => false,
:trusted_source => true,
}
end
end
let :params do
{
- :include_deb => false,
- :include_src => true,
+ :include => {'deb' => false, 'src' => true,},
:architecture => 'x86_64',
}
end
# <%= @comment %>
-<%- if @include_deb then -%>
+<%- if @_include['deb'] then -%>
deb <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release %> <%= @repos %>
<%- end -%>
-<%- if @include_src then -%>
+<%- if @_include['src'] then -%>
deb-src <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release %> <%= @repos %>