From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 23 Oct 2013 14:13:55 +0000 (-0700)
Subject: Merge pull request #182 from stefanvanwouw/master
X-Git-Tag: 1.4.1~19
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a350da76046b2d42f73ff6aed566adce1f13ff01;hp=1ad70436d5b8ccc4136e38a285443f39de7ed154;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #182 from stefanvanwouw/master

apt::source templates/sources.list.erb generates invalid source line when architecture is provided.
---

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 9ad4d46..215d1e6 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -73,7 +73,7 @@ describe 'apt::source', :type => :define do
       let :content do
         content = "# #{title}"
         if param_hash[:architecture]
-          arch = "[arch=#{param_hash[:architecture]}]"
+          arch = "[arch=#{param_hash[:architecture]}] "
         end
         content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
 
diff --git a/templates/source.list.erb b/templates/source.list.erb
index e8b6865..9946966 100644
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,5 +1,5 @@
 # <%= @name %>
-deb <% if @architecture %>[arch=<%= @architecture %>]<% end %><%= @location %> <%= @release_real %> <%= @repos %>
+deb <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- if @include_src then -%>
-deb-src <% if @architecture %>[arch=<%= @architecture %>]<% end %><%= @location %> <%= @release_real %> <%= @repos %>
+deb-src <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>