diff options
author | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 08:12:11 -0500 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2013-01-02 17:28:59 +0100 |
commit | ded81d8edcc9a7cc8275a68f669fde896379b12e (patch) | |
tree | 244f0fda87dc42ab62474b306fabcb658604342d /manifests/dist_upgrade.pp | |
parent | 17f67d9fac83193f4436e82fc6046e065d9ab024 (diff) |
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/dist_upgrade.pp')
-rw-r--r-- | manifests/dist_upgrade.pp | 12 |
1 files changed, 7 insertions, 5 deletions
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 } } |