Stop redeclaring variables from params

It really seems unnecessary.
puppetlabs · Feb 20, 2015 · ae71c42 · ae71c42
1 parent 59c362a
commit ae71c42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/manifests/pin.pp b/manifests/pin.pp
@@ -16,8 +16,6 @@
   $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 @@
   $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
 
   $path = $order ? {
-    ''      => "${preferences_d}/${file_name}.pref",
-    default => "${preferences_d}/${order}-${file_name}.pref",
+    ''      => "${apt::params::preferences_d}/${file_name}.pref",
+    default => "${apt::params::preferences_d}/${order}-${file_name}.pref",
   }
   file { "${file_name}.pref":
     ensure  => $ensure,

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
@@ -7,8 +7,6 @@
 ) {
   include apt::update
 
-  $sources_list_d = $apt::params::sources_list_d
-
   if ! $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
@@ -49,7 +47,7 @@
     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::params::sources_list_d}/${sources_list_d_filename}",
         user        => 'root',
         logoutput   => 'on_failure',
         notify      => Exec['apt_update'],
@@ -59,14 +57,14 @@
         ],
     }
 
-    file { "${sources_list_d}/${sources_list_d_filename}":
+    file { "${apt::params::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::params::sources_list_d}/${sources_list_d_filename}":
         ensure => 'absent',
         notify => Exec['apt_update'],
     }

diff --git a/manifests/source.pp b/manifests/source.pp
@@ -22,9 +22,6 @@
   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')
@@ -37,7 +34,7 @@
 
   file { "${name}.list":
     ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
+    path    => "${apt::params::sources_list_d}/${name}.list",
     owner   => root,
     group   => root,
     mode    => '0644',