Merge pull request #85 from dalen/pin_explanation

(#16076) Ability to fill in pin explanation

diff --git a/manifests/pin.pp b/manifests/pin.pp
index cebc6e7b0da2c390092324ad7c32c5e236dab641..21cc3ffdefc0294c0c91c37de474971b94b26869 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -3,6 +3,7 @@
 
 define apt::pin(
   $ensure     = present,
+  $explanation = "${::caller_module_name}: ${name}",
   $order      = '',
   $packages   = '*',
   $priority   = 0,

diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
index cd269d3b8bb11b3deff3831df99be63b5d877da8..3aaf49cef494e79f3b4fce0c2e2e02ba91d7915d 100644 (file)
--- a/spec/defines/pin_spec.rb
+++ b/spec/defines/pin_spec.rb
@@ -50,7 +50,7 @@ describe 'apt::pin', :type => :define do
           'owner'   => 'root',
           'group'   => 'root',
           'mode'    => '0644',
-          'content' => "# #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{param_hash[:release] || title}\nPin-Priority: #{param_hash[:priority]}\n",
+          'content' => "# #{title}\nExplanation: : #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{param_hash[:release] || title}\nPin-Priority: #{param_hash[:priority]}\n",
         })
       }
     end

diff --git a/templates/pin.pref.erb b/templates/pin.pref.erb
index 9a1e690ee66b49254e14f63aa265396460ec6d53..74b92659b87352db11945d7e1cd07971c1ec2613 100644 (file)
--- a/templates/pin.pref.erb
+++ b/templates/pin.pref.erb
@@ -1,4 +1,5 @@
 # <%= name %>
+Explanation: <%= explanation %>
 Package: <%= packages %>
 Pin: <%= pin %>
 Pin-Priority: <%= priority %>