summaryrefslogtreecommitdiff
path: root/manifests/dist_upgrade.pp
diff options
context:
space:
mode:
authorGabriel Filion <lelutin@gmail.com>2013-01-02 07:32:12 -0500
committerGabriel Filion <lelutin@gmail.com>2013-01-02 07:32:12 -0500
commitcda713fcf6bd189c3e870c9e466aa5f41d1847b6 (patch)
tree9cf8ba23ed7255c23f3acf788f4f79f84d13e2df /manifests/dist_upgrade.pp
parentd1d7f7b9bd73cfd982fe3c520f1de266c5836f8c (diff)
parent37e5594770f4e8570f3acbb6e15ae6f0286ca379 (diff)
Merge branch 'master' into issue_3953
Diffstat (limited to 'manifests/dist_upgrade.pp')
-rw-r--r--manifests/dist_upgrade.pp9
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index 9e26769..ed25b0b 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,11 +1,16 @@
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",
refreshonly => true,
- require => Exec['apt_updated'],
+ require => $apt::disable_update ? {
+ true => undef,
+ default => Exec['apt_updated'],
+ }
}
}