summaryrefslogtreecommitdiff
path: root/manifests/dist_upgrade.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-26 14:42:17 +0100
committervarac <varacanero@zeromail.org>2016-02-01 20:49:14 +0100
commit474c5f8e9a88ad1edf3b00c90356c88a6c92c18a (patch)
treea15775fa23fda48039a18c5c59f45266880220b4 /manifests/dist_upgrade.pp
parentd459567bf246eee85cd101c2e2f17f451e6230b8 (diff)
[refactor] Unify `apt-get update` into one resource
Before, there were two Execs that did an `apt-get update`, `Exec[refresh_apt]` and `Exec[apt_updated]`, which were triggered by different resources. This changes gets rid of the first one, and all resources now depend on `Exec[apt_updated]`.
Diffstat (limited to 'manifests/dist_upgrade.pp')
-rw-r--r--manifests/dist_upgrade.pp11
1 files changed, 1 insertions, 10 deletions
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index bf78dcc..19c031e 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,18 +1,9 @@
class apt::dist_upgrade {
- 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',
refreshonly => true,
- require => $req
+ before => Exec['apt_updated']
}
}