Don't pass options to ppa on lucid

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 8e4fa932b17cbe873daef887f9c7df69e1df8b9d..ae464436dadefdc3a451302ca5819db596f072ca 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,17 +5,33 @@ class apt::params {
   $apt_conf_d     = "${root}/apt.conf.d"
   $preferences_d  = "${root}/preferences.d"
 
-  case $lsbdistid {
+  case $::lsbdistid {
     'debian': {
-      $backports_location = 'http://backports.debian.org/debian-backports'
+      case $::lsbdistcodename {
+        'squeeze': {
+          $backports_location = 'http://backports.debian.org/debian-backports'
+        }
+        'wheezy': {
+          $backports_location = 'http://ftp.debian.org/debian/'
+        }
+        default: {
+          $backports_location = 'http://http.debian.net/debian/'
+        }
+      }
     }
     'ubuntu': {
-      case $lsbdistcodename {
-        'hardy','lucid','maverick','natty','oneiric','precise': {
+      case $::lsbdistcodename {
+        'hardy','maverick','natty','oneiric','precise': {
+          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+          $ppa_options = 'y'
+        }
+        'lucid': {
           $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+          $ppa_options = undef
         }
         default: {
           $backports_location = 'http://old-releases.ubuntu.com/ubuntu'
+          $ppa_options = 'y'
         }
       }
     }