From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 21 Jan 2015 18:54:37 +0000 (-0800)
Subject: Trusted will be a reserved word in Puppet 4
X-Git-Tag: 1.8.0~20^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3d25c08ec1745466dea99b121cfef72f8255cfe3;p=puppet-modules%2Fpuppetlabs-apt.git

Trusted will be a reserved word in Puppet 4

Rename the new `trusted` parameter to `trusted_source`.
---

diff --git a/README.md b/README.md
index 554561d..04bb339 100644
--- a/README.md
+++ b/README.md
@@ -303,7 +303,7 @@ apt::sources:
 * `key_source`: See apt::key
 * `pin`: See apt::pin
 * `architecture`: can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. Defaults to 'undef' which means all. Example values can be 'i386' or 'i386,alpha,powerpc'
-* `trusted` can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to false. Can be 'true' or 'false'.
+* `trusted_source` can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to false. Can be 'true' or 'false'.
 
 ### Testing
 
diff --git a/manifests/source.pp b/manifests/source.pp
index 04c3671..c5ed3a6 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -16,14 +16,14 @@ define apt::source(
   $key_source        = undef,
   $pin               = false,
   $architecture      = undef,
-  $trusted           = false,
+  $trusted_source    = false,
 ) {
 
   include apt::params
   include apt::update
 
   validate_string($architecture)
-  validate_bool($trusted)
+  validate_bool($trusted_source)
 
   $sources_list_d = $apt::params::sources_list_d
   $provider       = $apt::params::provider
diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index ae47ccf..b4d3799 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -55,7 +55,7 @@ describe 'apt::source', :type => :define do
         'key_source'        => 'http://apt.puppetlabs.com/pubkey.gpg',
         'pin'               => '10',
         'architecture'      => 'x86_64',
-        'trusted'           => true,
+        'trusted_source'    => true,
       }
     end
 
@@ -94,7 +94,7 @@ describe 'apt::source', :type => :define do
     }
   end
 
-  context 'trusted true' do
+  context 'trusted_source true' do
     let :facts do
       {
         :lsbdistid       => 'Debian',
@@ -104,8 +104,8 @@ describe 'apt::source', :type => :define do
     end
     let :params do
       {
-        'include_src' => false,
-        'trusted'     => true,
+        'include_src'    => false,
+        'trusted_source' => true,
       }
     end
 
diff --git a/templates/source.list.erb b/templates/source.list.erb
index f9a878e..7514766 100644
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,12 +1,12 @@
 #file generated by puppet
 # <%= @comment %>
 <%- if @include_deb then -%>
-deb <%- if @architecture or @trusted -%>
-[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>trusted=yes<% end -%>
+deb <%- if @architecture or @trusted_source -%>
+[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
 ] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>
 <%- if @include_src then -%>
-deb-src <%- if @architecture or @trusted -%>
-[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>trusted=yes<% end -%>
+deb-src <%- if @architecture or @trusted_source -%>
+[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
 ] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>