Merge pull request #429 from mhaskel/remove_include_update

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

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 2ce81fd6bb292fce2eae61e60bf82b2e01bfa048..a6e3cf8e29cceebd65a772cf42525a2d2f8d0375 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -16,9 +16,6 @@ define apt::pin(
   $originator      = '', # o=
   $label           = ''  # l=
 ) {
-
-  include apt::params
-
   $preferences_d = $apt::params::preferences_d
 
   if $order != '' and !is_integer($order) {
@@ -35,7 +32,7 @@ define apt::pin(
   $pin_release = join($pin_release_array, '')
 
   # Read the manpage 'apt_preferences(5)', especially the chapter
-  # 'Thea Effect of APT Preferences' to understand the following logic
+  # 'The Effect of APT Preferences' to understand the following logic
   # and the difference between specific and general form
   if is_array($packages) {
     $packages_string = join($packages, ' ')
@@ -44,24 +41,17 @@ define apt::pin(
   }
 
   if $packages_string != '*' { # specific form
-
     if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
-      ( $origin != '' and ( $pin_release != '' or $version != '' )) or
       ( $version != '' and ( $pin_release != '' or $origin != '' )) {
       fail('parameters release, origin, and version are mutually exclusive')
     }
-
   } else { # general form
-
     if $version != '' {
       fail('parameter version cannot be used in general form')
     }
-
-    if ( $pin_release != '' and $origin != '' ) or
-      ( $origin != '' and $pin_release != '' ) {
-      fail('parmeters release and origin are mutually exclusive')
+    if ( $pin_release != '' and $origin != '' ) {
+      fail('parameters release and origin are mutually exclusive')
     }
-
   }
 
 
@@ -84,6 +74,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'),
   }
 }