Merge pull request #452 from puppetlabs/daenney/rename-trusted-source

apt::source: Rename `trusted_source`.
This commit is contained in:
Morgan Haskel 2015-03-05 16:49:23 -08:00
commit a8250aecfe
3 changed files with 11 additions and 11 deletions

View file

@ -10,10 +10,10 @@ define apt::source(
$key = undef,
$pin = false,
$architecture = undef,
$trusted_source = false,
$allow_unsigned = false,
) {
validate_string($architecture, $comment, $location, $repos)
validate_bool($trusted_source)
validate_bool($allow_unsigned)
validate_hash($include)
unless $release {

View file

@ -44,7 +44,7 @@ describe 'apt::source' do
:key => GPG_KEY_ID,
:pin => '10',
:architecture => 'x86_64',
:trusted_source => true,
:allow_unsigned => true,
}
end
@ -79,7 +79,7 @@ describe 'apt::source' do
'source' => 'http://apt.puppetlabs.com/pubkey.gpg',},
:pin => '10',
:architecture => 'x86_64',
:trusted_source => true,
:allow_unsigned => true,
}
end
@ -115,7 +115,7 @@ describe 'apt::source' do
:key => GPG_KEY_ID,
:pin => '10',
:architecture => 'x86_64',
:trusted_source => true,
:allow_unsigned => true,
}
end
@ -139,7 +139,7 @@ describe 'apt::source' do
end
end
context 'trusted_source true' do
context 'allow_unsigned true' do
let :facts do
{
:lsbdistid => 'Debian',
@ -149,7 +149,7 @@ describe 'apt::source' do
end
let :params do
{
:trusted_source => true,
:allow_unsigned => true,
}
end

View file

@ -1,11 +1,11 @@
# <%= @comment %>
<%- if @_include['deb'] then -%>
deb <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
deb <%- if @architecture or @allow_unsigned -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @allow_unsigned %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release %> <%= @repos %>
<%- end -%>
<%- if @_include['src'] then -%>
deb-src <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
deb-src <%- if @architecture or @allow_unsigned -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @allow_unsigned %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release %> <%= @repos %>
<%- end -%>