apt::source: Merge `include_*` options into hash.

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

diff --git a/templates/source.list.erb b/templates/source.list.erb
index 75147667b50eaf61a6fbe510caa2def1be984777..00457de64a194f445142b6ca8f720051147883c1 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,12 +1,11 @@
-#file generated by puppet
 # <%= @comment %>
-<%- if @include_deb then -%>
+<%- 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 %><%= @location %> <%= @release %> <%= @repos %>
 <%- end -%>
-<%- if @include_src then -%>
+<%- 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 %>
+] <%- end %><%= @location %> <%= @release %> <%= @repos %>
 <%- end -%>