X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fbackports.pp;h=e9180c48c22a80c69ff699e076ca482a46f621dd;hb=5cdf186c45ca05d5ccecd74aa00172b7eff93d35;hp=152689055c70569dd1ca9aabb1e5c1c937d47324;hpb=42af4cdc74f1b9fbe53da99ef77126274c2124c2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/backports.pp b/manifests/backports.pp
index 1526890..e9180c4 100644
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -16,31 +16,33 @@
 #
 # == Authors
 #
-# Ben Hughes, I think. At least blame him if this goes wrong. I just added puppet doc.
+# Ben Hughes, I think. At least blame him if this goes wrong.
+# I just added puppet doc.
 #
 # == Copyright
 #
 # Copyright 2011 Puppet Labs Inc, unless otherwise noted.
 class apt::backports(
-  $release  = $lsbdistcodename,
+  $release  = $::lsbdistcodename,
   $location = $apt::params::backports_location
 ) inherits apt::params {
 
   $release_real = downcase($release)
+  $key = $::lsbdistid ? {
+    'debian' => '55BE302B',
+    'ubuntu' => '437D05B5',
+  }
+  $repos = $::lsbdistid ? {
+    'debian' => 'main contrib non-free',
+    'ubuntu' => 'main universe multiverse restricted',
+  }
 
-  apt::source { 'backports.list':
+  apt::source { 'backports':
     location   => $location,
     release    => "${release_real}-backports",
-    repos      => $lsbdistid ? {
-      'debian' => 'main contrib non-free',
-      'ubuntu' => 'universe multiverse restricted',
-    },
-    key        => $lsbdistid ? {
-      'debian' => '55BE302B',
-      'ubuntu' => '437D05B5',
-    },
+    repos      => $repos,
+    key        => $key,
     key_server => 'pgp.mit.edu',
     pin        => '200',
-    notify => Exec["apt_update"],
   }
 }