diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
| commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
| tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /manifests/dist_upgrade.pp | |
| parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
| parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
| download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
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 9e26769..bf78dcc 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -1,11 +1,18 @@ class apt::dist_upgrade { - 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 } } |