Merge pull request #75 from ytjohn/patch-1

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

diff --git a/manifests/pin.pp b/manifests/pin.pp
index f19df00f230f859d03674afad42a35ff4f532243..14df14b5b3f370c8ec7bc7978f535ceb15e28548 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -2,11 +2,12 @@
 # pin a release in apt, useful for unstable repositories
 
 define apt::pin(
-  $ensure   = present,
-  $packages = '*',
-  $priority = 0,
-  $release  = '',
-  $origin   = ''
+  $ensure     = present,
+  $packages   = '*',
+  $priority   = 0,
+  $release    = '',
+  $origin     = '',
+  $originator = ''
 ) {
 
   include apt::params
@@ -17,13 +18,15 @@ define apt::pin(
     $pin = "release a=${release}"
   } elsif $origin != '' {
     $pin = "origin \"${origin}\""
+  } elsif $originator != '' {
+    $pin = "release o=${originator}"
   } else {
-    err("Apt::Pin needs either $release or $origin")
+    $pin = "release a=${name}"
   }
 
   file { "${name}.pref":
     ensure  => $ensure,
-    path    => "${preferences_d}/${name}",
+    path    => "${preferences_d}/${name}.pref",
     owner   => root,
     group   => root,
     mode    => '0644',