diff options
author | varac <varacanero@zeromail.org> | 2012-12-19 09:40:53 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2012-12-19 09:40:53 +0100 |
commit | ffb44c91db24d30bb9584eb27d52f76958d6b732 (patch) | |
tree | 5d3e4e2c755c14e7a9e95dbb89615f8fbd0c0367 /manifests/dist_upgrade.pp | |
parent | 0d5311b1a9fa82e4e423a9e7ce7f5eb919bab40d (diff) | |
parent | 3a473dafd5887cb77b0b764dd951d9581b69f160 (diff) |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'manifests/dist_upgrade.pp')
-rw-r--r-- | manifests/dist_upgrade.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp index 9e26769..47b1cff 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -1,6 +1,8 @@ class apt::dist_upgrade { - include apt::update + if $apt::disable_update == false { + include apt::update + } exec { 'apt_dist-upgrade': command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade", |