From ded81d8edcc9a7cc8275a68f669fde896379b12e Mon Sep 17 00:00:00 2001
From: Gabriel Filion <lelutin@gmail.com>
Date: Wed, 2 Jan 2013 08:12:11 -0500
Subject: Apply code style corrections from puppet-lint

Signed-off-by: Gabriel Filion <lelutin@gmail.com>

+ more linting by intrigeri.

Conflicts:
	manifests/apticron.pp
	manifests/cron/dist_upgrade.pp
	manifests/cron/download.pp
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/listchanges.pp
	manifests/preferences.pp
	manifests/preseeded_package.pp
	manifests/proxy_client.pp
	manifests/unattended_upgrades.pp
	manifests/update.pp
---
 manifests/dist_upgrade.pp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'manifests/dist_upgrade.pp')

diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index ed25b0b..bf78dcc 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -4,13 +4,15 @@ class apt::dist_upgrade {
     include apt::update
   }
 
+  $req = $apt::disable_update ? {
+    true    => undef,
+    default => Exec['apt_updated'],
+  }
+
   exec { 'apt_dist-upgrade':
-    command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
+    command     => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade',
     refreshonly => true,
-    require     => $apt::disable_update ? {
-      true    => undef,
-      default => Exec['apt_updated'],
-    }
+    require     => $req
   }
 
 }
-- 
cgit v1.2.3