diff options
| author | varac <varacanero@zeromail.org> | 2013-04-14 13:25:21 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-14 13:25:21 +0200 |
| commit | fb19032afc0da5b4d9c6c40ae277173905b4454e (patch) | |
| tree | 73731eddb479e418bcb64a2d2b218b1bf007dabb /manifests/init.pp | |
| parent | 1ff5a86f5922df3de9a2bcc4b02f8925a7ef17ec (diff) | |
| parent | 6bf7a6ab5d6e63f75c94f49aa0f12959e954efa8 (diff) | |
| download | puppet-apt-fb19032afc0da5b4d9c6c40ae277173905b4454e.tar.gz puppet-apt-fb19032afc0da5b4d9c6c40ae277173905b4454e.tar.bz2 | |
Merge branch 'master' of code.leap.se:puppet_apt into nadir_master
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 3f8e1c8..faddf09 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -128,7 +128,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] } } } |