From: Erik Dalén Date: Wed, 22 Aug 2012 08:22:21 +0000 (+0200) Subject: (#16076) Ability to fill in pin explanation X-Git-Tag: 1.0.0~1^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=75092fdbf1b87dbff22ae5b728b390c778db6d91;p=puppet-modules%2Fpuppetlabs-apt.git (#16076) Ability to fill in pin explanation Adds the ability to fill it in and sets a reasonable default. --- diff --git a/manifests/pin.pp b/manifests/pin.pp index cebc6e7..21cc3ff 100644 --- 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 cd269d3..3aaf49c 100644 --- 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 9a1e690..74b9265 100644 --- a/templates/pin.pref.erb +++ b/templates/pin.pref.erb @@ -1,4 +1,5 @@ # <%= name %> +Explanation: <%= explanation %> Package: <%= packages %> Pin: <%= pin %> Pin-Priority: <%= priority %>