Revert "Fix use of $::apt::params::backports and $::apt::params::xfacts."

diff --git a/manifests/backports.pp b/manifests/backports.pp
index f4c5faaf8997e1ce3db5be5b518314f72f6b9f84..3cac0b5b5bc54bf7420a145231c7a1d4e94c3b5d 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -4,7 +4,7 @@ class apt::backports (
   $repos    = undef,
   $key      = undef,
   $pin      = 200,
   $repos    = undef,
   $key      = undef,
   $pin      = 200,

-) inherits apt::params {
+){

   if $location {
     validate_string($location)
     $_location = $location
   if $location {
     validate_string($location)
     $_location = $location


@@ -29,18 +29,18 @@ class apt::backports (
     }
   }
 
     }
   }
 

-  if ($::apt::params::xfacts['lsbdistid'] == 'debian' or $::apt::params::xfacts['lsbdistid'] == 'ubuntu') {
+  if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {

     unless $location {
     unless $location {

-      $_location = $::apt::params::backports['location']
+      $_location = $::apt::backports['location']

     }
     unless $release {
     }
     unless $release {

-      $_release = "${::apt::params::xfacts['lsbdistcodename']}-backports"
+      $_release = "${::apt::xfacts['lsbdistcodename']}-backports"

     }
     unless $repos {
     }
     unless $repos {

-      $_repos = $::apt::params::backports['repos']
+      $_repos = $::apt::backports['repos']

     }
     unless $key {
     }
     unless $key {

-      $_key =  $::apt::params::backports['key']
+      $_key =  $::apt::backports['key']

     }
   } else {
     unless $location and $release and $repos and $key {
     }
   } else {
     unless $location and $release and $repos and $key {

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index cf98fdd5e1a153da357f58afb7888399ea113814..f3e2bfda040c82f3890fce47947949590c04c338 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,17 +2,15 @@
 define apt::ppa(
   $ensure         = 'present',
   $options        = $::apt::ppa_options,
 define apt::ppa(
   $ensure         = 'present',
   $options        = $::apt::ppa_options,

-  $release        = $::apt::params::xfacts['lsbdistcodename'],
+  $release        = $::apt::xfacts['lsbdistcodename'],

   $package_name   = $::apt::ppa_package,
   $package_manage = false,
 ) {
   $package_name   = $::apt::ppa_package,
   $package_manage = false,
 ) {

-  include 'apt::params'
-

   unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
   unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 

-  if $::apt::params::xfacts['lsbdistid'] == 'Debian' {
+  if $::apt::xfacts['lsbdistid'] == 'Debian' {

     fail('apt::ppa is not currently supported on Debian.')
   }
 
     fail('apt::ppa is not currently supported on Debian.')
   }