(#14321) apt::pin resource support release.

apt::pin release should default to title, but should be able to
override. This update removes unnecessary "" around $name, and add spec
tests.

Conflicts:

	spec/defines/pin_spec.rb

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 7356a67497513a8575008c68a6927b3fb5fef4bb..29fddfb85ae4656369c023b1e2522bf909f2ff5c 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -5,7 +5,7 @@ define apt::pin(
   $ensure   = present,
   $packages = '*',
   $priority = 0,
-  $release = "${name}"
+  $release  = $name
 ) {
 
   include apt::params

diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
index c5d3fd91af03f3c159c1c25316943860e68e9e3c..b5b10d702b9f32885540706a256c8b6b7b463444 100644 (file)
--- a/spec/defines/pin_spec.rb
+++ b/spec/defines/pin_spec.rb
@@ -6,7 +6,8 @@ describe 'apt::pin', :type => :define do
     {
       :ensure   => 'present',
       :packages => '*',
-      :priority => '0'
+      :priority => '0',
+      :release  => nil
     }
   end
 
@@ -19,6 +20,11 @@ describe 'apt::pin', :type => :define do
       :ensure    => 'absent',
       :packages  => 'apache',
       :priority  => '1'
+    },
+    {
+      :packages  => 'apache',
+      :priority  => '1',
+      :release   => 'my_newpin'
     }
   ].each do |param_set|
     describe "when #{param_set == {} ? "using default" : "specifying"} define parameters" do
@@ -38,7 +44,7 @@ describe 'apt::pin', :type => :define do
           'owner'   => 'root',
           'group'   => 'root',
           'mode'    => '0644',
-          'content' => "# #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{title}\nPin-Priority: #{param_hash[:priority]}",
+          'content' => "# #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{param_hash[:release] || title}\nPin-Priority: #{param_hash[:priority]}",
         })
       }
     end