1 files changed, 12 insertions, 15 deletions

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 2b2fb74..04fb010 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -1,10 +1,10 @@
 define apt::preferences_snippet (
   $priority = undef,
-  $package = false,
-  $ensure = 'present',
-  $source = undef,
-  $release = undef,
-  $pin = undef
+  $package  = false,
+  $ensure   = 'present',
+  $source   = undef,
+  $release  = undef,
+  $pin      = undef,
 ) {
 
   $real_package = $package ? {
@@ -13,26 +13,23 @@ define apt::preferences_snippet (
   }
 
   if $ensure == 'present' {
-    if $apt::custom_preferences == false {
-      fail('Trying to define a preferences_snippet with $custom_preferences set to false.')
-    }
 
     if $priority == undef {
-      fail('apt::preferences_snippet requires the \'priority\' argument to be set')
+      fail("apt::preferences_snippet requires the 'priority' argument to be set")
     }
 
     if !$pin and !$release {
-      fail('apt::preferences_snippet requires one of the \'pin\' or \'release\' argument to be set')
+      fail("apt::preferences_snippet requires one of the 'pin' or 'release' argument to be set")
     }
     if $pin and $release {
-      fail('apt::preferences_snippet requires either a \'pin\' or \'release\' argument, not both')
+      fail("apt::preferences_snippet requires either a 'pin' or 'release' argument, not both")
     }
   }
 
   file { "/etc/apt/preferences.d/${name}":
     ensure => $ensure,
     owner  => root, group => 0, mode => '0644',
-    before => Exec['apt_updated'];
+    before => Exec['update_apt'];
   }
 
   case $source {
@@ -40,19 +37,19 @@ define apt::preferences_snippet (
       case $release {
         undef: {
           File["/etc/apt/preferences.d/${name}"]{
-            content => template('apt/preferences_snippet.erb')
+            content => template('apt/preferences_snippet.erb'),
           }
         }
         default: {
           File["/etc/apt/preferences.d/${name}"]{
-            content => template('apt/preferences_snippet_release.erb')
+            content => template('apt/preferences_snippet_release.erb'),
           }
         }
       }
     }
     default: {
       File["/etc/apt/preferences.d/${name}"]{
-        source => $source
+        source => $source,
       }
     }
   }