Merge pull request #578 from phervieux/15.10

Add ubuntu 15.10 support

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 393a907db98b9eb23e39ca5945a1682b2f1bb0c0..c310fb695bba35b67f1bd095c8c1f9593fbb87e1 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##Supported Release 2.2.1
+###Summary
+
+Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
+
 ##2015-09-29 - Supported Release 2.2.0
 ###Summary
 

diff --git a/README.md b/README.md
index 5ab4275a3896a110091eaa064d5320322ac9e796..cfad084da7fe8cb55d4e3226e23adb0ef91bea13 100644 (file)
--- a/README.md
+++ b/README.md
@@ -467,12 +467,14 @@ Manages the GPG keys that Apt uses to authenticate packages.
 
 This module is tested and officially supported on Debian 6 and 7 and Ubuntu 10.04, 12.04, and 14.04. Testing on other platforms has been light and cannot be guaranteed.
 
+This module is not designed to be split across [run stages](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html).
+
 ### Adding new sources or PPAs
 
 If you are adding a new source or PPA and trying to install packages from the new source or PPA on the same Puppet run, your `package` resource should depend on `Class['apt::update']`, in addition to depending on the `Apt::Source` or the `Apt::Ppa`. You can also add [collectors](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html) to ensure that all packages happen after `apt::update`, but this can lead to dependency cycles and has implications for [virtual resources](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html#behavior).
 
 ~~~puppet
-Class['apt::update'] -> Package<| |>
+Class['apt::update'] -> Package <| provider == 'apt' |>
 ~~~
 
 ## Development

diff --git a/metadata.json b/metadata.json
index 8632a36dfd04e14ba228c58851e3c8b6482874ea..77ba0fcafab5c3e7f647ceb94a2632b58b08d18b 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Puppet Labs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.3.0 < 2015.3.0"
+      "version_requirement": ">= 3.3.0 < 2015.4.0"
     },
     {
       "name": "puppet",

diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
index 2e813f327bfbfe318a4882819f1df001e6334aa6..0b98176e2a6923f177e38b0c79bdb4e7e8090014 100644 (file)
--- a/spec/defines/source_compat_spec.rb
+++ b/spec/defines/source_compat_spec.rb
@@ -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
 

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 8a2cfcc7475698bb477061131c885475eb15ea28..cfae55cc8f7e2ae01989a4fd2e26dedde6687bad 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -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
 

diff --git a/templates/source.list.erb b/templates/source.list.erb
index fe7f55941a1ac43098ed15b2e9aed0461818d499..84cd2cf72862bedcb557823b6d5a690cd6119b10 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -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 -%>