diff options
| author | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
| commit | e596bfb9306664ab4aef78bc05615904b7c6e7f2 (patch) | |
| tree | d9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3 /manifests/dist_upgrade.pp | |
| parent | 08b066db441375d1613d131767cb1c5bdd3bb60b (diff) | |
| parent | d51e2af9d452731f63b2fe16391e9cd2ff9d640f (diff) | |
| download | puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.gz puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp
Diffstat (limited to 'manifests/dist_upgrade.pp')
| -rw-r--r-- | manifests/dist_upgrade.pp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp index 347ccc7..bf78dcc 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -1,11 +1,18 @@ class apt::dist_upgrade { - if $apt::disable_update = false { include apt::update } + if $apt::disable_update == false { + 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 => Exec['apt_updated'], + require => $req } } |