Merge pull request #431 from mhaskel/local_variable_declarations

Stop redeclaring variables from params

diff --git a/manifests/pin.pp b/manifests/pin.pp
index a6e3cf8e29cceebd65a772cf42525a2d2f8d0375..c4eb1f8dcf326d9424d7d910939aa7d9da2d52a8 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -16,8 +16,6 @@ define apt::pin(
   $originator      = '', # o=
   $label           = ''  # l=
 ) {
-  $preferences_d = $apt::params::preferences_d
-
   if $order != '' and !is_integer($order) {
     fail('Only integers are allowed in the apt::pin order param')
   }
@@ -65,8 +63,8 @@ define apt::pin(
   $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
 
   $path = $order ? {
-    ''      => "${preferences_d}/${file_name}.pref",
-    default => "${preferences_d}/${order}-${file_name}.pref",
+    ''      => "${::apt::preferences_d}/${file_name}.pref",
+    default => "${::apt::preferences_d}/${order}-${file_name}.pref",
   }
   file { "${file_name}.pref":
     ensure  => $ensure,

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 788262f09f4d48c20f14127f008ea5f62284d0f1..3a11ede779799401a68e42d318774bc8c428b486 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,9 +2,8 @@
 define apt::ppa(
   $ensure  = 'present',
   $release = $::lsbdistcodename,
-  $options = $apt::params::ppa_options,
+  $options = $::apt::ppa_options,
 ) {
-  $sources_list_d = $apt::params::sources_list_d
 
   if ! $release {
     fail('lsbdistcodename fact not available: release parameter required')
@@ -46,7 +45,7 @@ define apt::ppa(
     exec { "add-apt-repository-${name}":
         environment => $proxy_env,
         command     => "/usr/bin/add-apt-repository ${options} ${name}",
-        unless      => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
+        unless      => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
         user        => 'root',
         logoutput   => 'on_failure',
         notify      => Exec['apt_update'],
@@ -56,14 +55,14 @@ define apt::ppa(
         ],
     }
 
-    file { "${sources_list_d}/${sources_list_d_filename}":
+    file { "${::apt::sources_list_d}/${sources_list_d_filename}":
         ensure  => file,
         require => Exec["add-apt-repository-${name}"],
     }
   }
   else {
 
-    file { "${sources_list_d}/${sources_list_d_filename}":
+    file { "${::apt::sources_list_d}/${sources_list_d_filename}":
         ensure => 'absent',
         notify => Exec['apt_update'],
     }

diff --git a/manifests/source.pp b/manifests/source.pp
index d145918223df02bfc1e3ee52985698edc976a53d..78b861f29cd9d815a6985430e83fc550cbb11f8d 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -20,9 +20,6 @@ define apt::source(
   validate_string($architecture)
   validate_bool($trusted_source)
 
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
-
   if $release == 'UNDEF' {
     if $::lsbdistcodename == undef {
       fail('lsbdistcodename fact not available: release parameter required')
@@ -35,7 +32,7 @@ define apt::source(
 
   file { "${name}.list":
     ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
+    path    => "${::apt::sources_list_d}/${name}.list",
     owner   => root,
     group   => root,
     mode    => '0644',

diff --git a/manifests/update.pp b/manifests/update.pp
index 26790ceafa8a34391336a4430111cdbc08ff65f0..6f338f043c692525c71668291d4d8c97a24a2403 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -57,7 +57,7 @@ class apt::update {
     $_refresh = true
   }
   exec { 'apt_update':
-    command     => "${apt::params::provider} update",
+    command     => "${::apt::provider} update",
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
     timeout     => $apt::update_timeout,