aboutsummaryrefslogtreecommitdiff
path: root/manifests/preferences.pp
diff options
context:
space:
mode:
authorGabriel Filion <lelutin@gmail.com>2013-01-02 08:12:11 -0500
committerintrigeri <intrigeri@boum.org>2013-01-02 17:28:59 +0100
commitded81d8edcc9a7cc8275a68f669fde896379b12e (patch)
tree244f0fda87dc42ab62474b306fabcb658604342d /manifests/preferences.pp
parent17f67d9fac83193f4436e82fc6046e065d9ab024 (diff)
downloadpuppet-apt-ded81d8edcc9a7cc8275a68f669fde896379b12e.tar.gz
puppet-apt-ded81d8edcc9a7cc8275a68f669fde896379b12e.tar.bz2
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
Diffstat (limited to 'manifests/preferences.pp')
-rw-r--r--manifests/preferences.pp14
1 files changed, 7 insertions, 7 deletions
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';
}
}