MODULES-2889 - remove unneeded whitespace in source.list template

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

diff --git a/templates/source.list.erb b/templates/source.list.erb
index f9a878e509e377e139955084194a7de955c7844b..84cd2cf72862bedcb557823b6d5a690cd6119b10 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,12 +1,9 @@
-#file generated by puppet
 # <%= @comment %>
-<%- if @include_deb then -%>
-deb <%- if @architecture or @trusted -%>
-[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>trusted=yes<% end -%>
-] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
+<%- if @_include['deb'] then -%>
+deb <%- if @architecture or @_allow_unsigned -%>
+[<%- if @architecture %>arch=<%= @architecture %><% end %><%if @architecture and @_allow_unsigned %> <% end%><% if @_allow_unsigned %>trusted=yes<% end %>] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
 <%- end -%>
-<%- if @include_src then -%>
-deb-src <%- if @architecture or @trusted -%>
-[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>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 @architecture and @_allow_unsigned %> <% end%><% if @_allow_unsigned %>trusted=yes<% end %>] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
 <%- end -%>