From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 15 Oct 2013 17:44:04 +0000 (-0700)
Subject: Merge pull request #173 from apenney/140-release
X-Git-Tag: 1.4.0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=924e89289b93db60ef0f16a4e71579fa88e037a6;hp=547d7ad96a802022e3f0c156b7e103da763ece0d;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #173 from apenney/140-release

Prepare 1.4.0 release.
---

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 0a8da3d..9ad4d46 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -75,10 +75,10 @@ describe 'apt::source', :type => :define do
         if param_hash[:architecture]
           arch = "[arch=#{param_hash[:architecture]}]"
         end
-        content << "\ndeb #{arch} #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+        content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
 
         if param_hash[:include_src]
-          content << "deb-src #{arch} #{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
+          content << "deb-src #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
         end
         content
       end
diff --git a/templates/source.list.erb b/templates/source.list.erb
index 845b8ae..e8b6865 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 -%>