Cleanup for `apt::source`

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

diff --git a/templates/source.list.erb b/templates/source.list.erb
index 9946966ee5322dab85336320c1adfba88999381e..fb0a38612e7f2ff42fa393c18488ec296004418a 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,5 +1,11 @@
-# <%= @name %>
-deb <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @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 %> <%= @repos %>
+<%- end -%>
 <%- if @include_src then -%>
-deb-src <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @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 %> <%= @repos %>
 <%- end -%>