Merge pull request #439 from mhaskel/rspec3

[puppet-modules/puppetlabs-apt.git] / manifests / pin.pp

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 54961ec8ddfa7e43fae6109efc44daa414e5c89d..c4eb1f8dcf326d9424d7d910939aa7d9da2d52a8 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -16,10 +16,6 @@ define apt::pin(
   $originator      = '', # o=
   $label           = ''  # l=
 ) {
-  include apt::params
-
-  $preferences_d = $apt::params::preferences_d
-
   if $order != '' and !is_integer($order) {
     fail('Only integers are allowed in the apt::pin order param')
   }
@@ -67,8 +63,8 @@ define apt::pin(
   $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
 
   $path = $order ? {
-    ''      => "${preferences_d}/${file_name}.pref",
-    default => "${preferences_d}/${order}-${file_name}.pref",
+    ''      => "${::apt::preferences_d}/${file_name}.pref",
+    default => "${::apt::preferences_d}/${order}-${file_name}.pref",
   }
   file { "${file_name}.pref":
     ensure  => $ensure,
@@ -76,6 +72,6 @@ define apt::pin(
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => template('apt/pin.pref.erb'),
+    content => template('apt/_header.erb', 'apt/pin.pref.erb'),
   }
 }