summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-20 17:47:03 +0100
committervarac <varacanero@zeromail.org>2013-01-20 17:47:03 +0100
commit5fdcfd3b80a038a18aba9a975270acc686efd185 (patch)
tree1b639d8f3841c9b76cd32f57a6a31590ab033eee /puppet
parentd7f7bad9b6d4a45aa06c74a1f630b38a534092e0 (diff)
don't run if another apt-get process is running
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index adf165bd..87a2fc00 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -1,11 +1,11 @@
class site_apt::dist_upgrade inherits apt::dist_upgrade {
- # really upgrade on every puppetrun
+ if $::apt_running == 'true' {
+ fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
+ }
+ # ensue dist-upgrade on every puppetrun
Exec['apt_dist-upgrade']{
refreshonly => false,
}
- # Ensure apt-get upgrade has been run before installing any packages
- # Disables because apt-get update is moved to stage initial
- # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |>
}