Drop testing on 3.3, add 3.5.

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

diff --git a/manifests/init.pp b/manifests/init.pp
index a55d584a1324469fec3d33ac6cc6619262f98f3d..48b62d178a30056b83d4edbde6598397bfad4497 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,18 +54,6 @@ class apt(
     true  => "# Repos managed by puppet.\n",
   }
 
-  if $lsbdistcodename == 'wheezy' {
-    $preferences_content = undef
-  } 
-  else {
-    $preferences_content = $purge_preferences ? {
-      false => undef,
-      true => "Explanation: Preferences managed by Puppet\n
-Explanation: We need a bogus package line because of Debian Bug #732746\n
-Package: bogus-package\n",
-    }
-  }
-
   if $always_apt_update == true {
     Exec <| title=='apt_update' |> {
       refreshonly => false,
@@ -98,13 +86,11 @@ Package: bogus-package\n",
     notify  => Exec['apt_update'],
   }
 
-  file { 'apt-preferences':
-    ensure  => present,
-    path    => "${root}/preferences",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => $preferences_content,
+  if $purge_preferences {
+    file { 'apt-preferences':
+      ensure  => absent,
+      path    => "${root}/preferences",
+    }
   }
 
   file { 'preferences.d':