Merge pull request #156 from rculbertson/master

Fixed several lint warnings and errors

diff --git a/manifests/init.pp b/manifests/init.pp
index 23197719500809e6b4d1e5c4b4aa5ad87fdf7feb..8f0c87bb5415ade4b11774849f6743889eca3375 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -105,10 +105,10 @@ class apt(
   }
 
   file { 'configure-apt-proxy':
+    ensure  => $proxy_set,
     path    => "${apt_conf_d}/proxy",
     content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
     notify  => Exec['apt_update'],
-    ensure  => $proxy_set,
   }
 
   # Need anchor to provide containment for dependencies.

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 39de3d8f1f688bbf1f79b5903c094558923efb07..402e79ede7a813327ec956935e07a2d9ee4e15d0 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -31,7 +31,7 @@ define apt::pin(
     $release_version,
     $component,
     $originator,
-    $label] 
+    $label]
   $pin_release = join($pin_release_array, '')
 
   # Read the manpage 'apt_preferences(5)', especially the chapter

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 92b6c0e0b28e131af31b3d0903d6de1882aca896..61b9b3a768dacb352e148ca0de0d53225ad85589 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,7 +2,7 @@
 
 define apt::ppa(
   $release = $::lsbdistcodename,
-  $options = "-y"
+  $options = '-y'
 ) {
   include apt::params
   include apt::update
@@ -28,10 +28,10 @@ define apt::ppa(
   }
 
   if defined(Class[apt]) {
-    $proxy_host = getparam(Class[apt], "proxy_host")
-    $proxy_port = getparam(Class[apt], "proxy_port")
+    $proxy_host = getparam(Class[apt], 'proxy_host')
+    $proxy_port = getparam(Class[apt], 'proxy_port')
     case  $proxy_host {
-      false, "": {
+      false, '': {
         $proxy_env = []
       }
       default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
@@ -41,14 +41,14 @@ define apt::ppa(
   }
   exec { "add-apt-repository-${name}":
     environment  => $proxy_env,
-    command   => "/usr/bin/add-apt-repository ${options} ${name}",
-    creates   => "${sources_list_d}/${sources_list_d_filename}",
-    logoutput => 'on_failure',
-    require   => [
+    command      => "/usr/bin/add-apt-repository ${options} ${name}",
+    creates      => "${sources_list_d}/${sources_list_d_filename}",
+    logoutput    => 'on_failure',
+    notify       => Exec['apt_update'],
+    require      => [
       File[$sources_list_d],
-      Package["${package}"],
+      Package[$package],
     ],
-    notify    => Exec['apt_update'],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":

diff --git a/tests/key.pp b/tests/key.pp
index cc90f909c091f2ee56700b6c91bcc3aae9a5ebea..79e0e1b749ab17bb853548ba8188fa665d8529ab 100644 (file)
--- a/tests/key.pp
+++ b/tests/key.pp
@@ -1,6 +1,6 @@
 # Declare Apt key for apt.puppetlabs.com source
 apt::key { 'puppetlabs':
-  key        => '4BD6EC30',
-  key_server => 'pgp.mit.edu',
-  key_options => "http-proxy=\"http://proxyuser:proxypass@example.org:3128\"",
+  key         => '4BD6EC30',
+  key_server  => 'pgp.mit.edu',
+  key_options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }