aboutsummaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-05-26 14:29:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-05-26 14:29:46 -0300
commit869db00cde98be60850f1c61297756635b90fee1 (patch)
tree77b5eb78813dbf5f66c42fb114e2b513e7b9e950 /manifests/init.pp
parent61fac2f15df901b5a213352024dd63e67f18ab18 (diff)
parent358d963f259d3f409bd0dd6433718a673083533c (diff)
downloadpuppet-apt-869db00cde98be60850f1c61297756635b90fee1.tar.gz
puppet-apt-869db00cde98be60850f1c61297756635b90fee1.tar.bz2
Merge branch 'nadir'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index de28c23..33eac37 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -129,7 +129,11 @@ class apt(
}
if $custom_preferences != false {
Exec['custom_keys'] {
- before => File['apt_config'],
+ before => [ Exec[refresh_apt], File['apt_config'] ]
+ }
+ } else {
+ Exec['custom_keys'] {
+ before => Exec[refresh_apt]
}
}
}