From 9c13872b5a4e08748695c9a7f99fc4ef844a8c29 Mon Sep 17 00:00:00 2001
From: Ken Barber <ken@bob.sh>
Date: Wed, 21 Mar 2012 13:35:48 +0000
Subject: [PATCH] (#13289) Fix some more style violations

---
 manifests/init.pp |  9 +++++----
 manifests/key.pp  | 25 +++++++++++++------------
 manifests/pin.pp  |  1 -
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 1a5c7e0..29db697 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,16 +41,17 @@ class apt(
     package { 'python-software-properties': }
   }
 
+  $sources_list_content = $purge_sources_list ? {
+    false =>  undef,
+    true  => "# Repos managed by puppet.\n",
+  }
   file { 'sources.list':
     ensure  => present,
     path    => "${apt::params::root}/sources.list",
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => $purge_sources_list ? {
-      false =>  undef,
-      true  => "# Repos managed by puppet.\n",
-    },
+    content => $sources_list_content,
   }
 
   file { 'sources.list.d':
diff --git a/manifests/key.pp b/manifests/key.pp
index 63165f7..e87968d 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -31,24 +31,25 @@ define apt::key (
 
       anchor { "apt::key/${title}":; }
 
-      if defined(Exec["apt::key $upkey absent"]) {
-        fail ("Cannot ensure Apt::Key[$upkey] present; $upkey already ensured absent")
+      if defined(Exec["apt::key ${upkey} absent"]) {
+        fail("Cannot ensure Apt::Key[${upkey}] present; ${upkey} already ensured absent")
       }
 
-      if !defined(Anchor["apt::key $upkey present"]) {
-        anchor { "apt::key $upkey present":; }
+      if !defined(Anchor["apt::key ${upkey} present"]) {
+        anchor { "apt::key ${upkey} present":; }
       }
 
       if !defined(Exec[$digest]) {
+        $digest_command = $method ? {
+          'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
+          'source'  => "wget -q '${key_source}' -O- | apt-key add -",
+          'server'  => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
+        }
         exec { $digest:
           path    => '/bin:/usr/bin',
           unless  => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
           before  => Anchor["apt::key ${upkey} present"],
-          command => $method ? {
-            'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
-            'source'  => "wget -q '${key_source}' -O- | apt-key add -",
-            'server'  => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
-          },
+          command => $digest_command,
         }
       }
 
@@ -57,11 +58,11 @@ define apt::key (
     }
     absent: {
 
-      if defined(Anchor["apt::key $upkey present"]) {
-        fail ("Cannot ensure Apt::Key[$upkey] absent; $upkey already ensured present")
+      if defined(Anchor["apt::key ${upkey} present"]) {
+        fail("Cannot ensure Apt::Key[${upkey}] absent; ${upkey} already ensured present")
       }
 
-      exec { "apt::key $upkey absent":
+      exec { "apt::key ${upkey} absent":
         path    => '/bin:/usr/bin',
         onlyif  => "apt-key list | grep '${upkey}'",
         command => "apt-key del '${upkey}'",
diff --git a/manifests/pin.pp b/manifests/pin.pp
index 95d445c..4661366 100644
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -8,7 +8,6 @@ define apt::pin(
 
   include apt::params
 
-  $pcontent = "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}"
   file { "${name}.pref":
     ensure  => file,
     path    => "${apt::params::root}/preferences.d/${name}",
-- 
2.32.3