opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #577 from syseleven/pp-2587

Browse source 
fix whitespace in source.list
This commit is contained in:
TP Honey 2015-12-14 11:27:00 +00:00
commit caf5f7a697
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/defines/source_compat_spec.rb
View file

@ -117,7 +117,7 @@ describe 'apt::source', :type => :define do
}
end
it { is_expected.to contain_apt__setting('list-my_source').with_content(/# my_source\ndeb \[arch=x86_64 \] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ wheezy main\n/)
it { is_expected.to contain_apt__setting('list-my_source').with_content(/# my_source\ndeb \[arch=x86_64\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ wheezy main\n/)
}
end

2
spec/defines/source_spec.rb
View file

@ -227,7 +227,7 @@ describe 'apt::source' do
it { is_expected.to contain_apt__setting('list-my_source').with({
:ensure => 'present',
}).with_content(/# my_source\ndeb-src \[arch=x86_64 \] hello.there wheezy main\n/)
}).with_content(/# my_source\ndeb-src \[arch=x86_64\] hello.there wheezy main\n/)
}
end

6
templates/source.list.erb
View file

@ -1,11 +1,9 @@
# <%= @comment %>
<%- 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 %>
[<%- 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 @_allow_unsigned -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @_allow_unsigned %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
[<%- if @architecture %>arch=<%= @architecture %><% end %><%if @architecture and @_allow_unsigned %> <% end%><% if @_allow_unsigned %>trusted=yes<% end %>] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
<%- end -%>