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/preferences.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests/preferences.pp')

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 66f36a7..9ed24c1 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -1,20 +1,20 @@
 class apt::preferences {
 
-  $pref_contents = $custom_preferences ? {
-    '' => $operatingsystem ? {
+  $pref_contents = $apt::custom_preferences ? {
+    ''      => $::operatingsystem ? {
       'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
       'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
     },
-    default => $custom_preferences
+    default => $apt::custom_preferences
   }
 
   file { '/etc/apt/preferences':
-    ensure => present,
-    alias => 'apt_config',
+    ensure  => present,
+    alias   => 'apt_config',
     # only update together
     content => $pref_contents,
-    require => File["/etc/apt/sources.list"],
-    owner => root, group => 0, mode => 0644;
+    require => File['/etc/apt/sources.list'],
+    owner   => root, group => 0, mode => '0644';
   }
 
 }
-- 
cgit v1.2.3