Fix gpg key checking warings after f588f26

[puppet-modules/puppetlabs-apt.git] / templates / source.list.erb

diff --git a/templates/source.list.erb b/templates/source.list.erb
index 65764b2612cac71780f8cbef50cb2b2d9faaf9d6..b50be8d1fd7601b3e2d4289d5f28f88793eb4962 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,5 +1,11 @@
-# <%= @name %>
-deb <%= @location %> <%= @release_real %> <%= @repos %>
+# <%= @comment %>
+<%- if @include_deb then -%>
+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 <%= @location %> <%= @release_real %> <%= @repos %>
+deb-src <%- if @architecture or @trusted_source -%>
+[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
+] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>