Merge pull request #529 from mhaskel/source_compatibility

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

diff --git a/templates/source.list.erb b/templates/source.list.erb
index b50be8d1fd7601b3e2d4289d5f28f88793eb4962..fe7f55941a1ac43098ed15b2e9aed0461818d499 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -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 -%>
-] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
+<%- if @_include['deb'] then -%>
+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 -%>
-] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
+<%- if @_include['src'] then -%>
+deb-src <%- if @architecture or @_allow_unsigned -%>
+[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @_allow_unsigned %>trusted=yes<% end -%>
+] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
 <%- end -%>