diff options
author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
commit | 3de76e7b05224b9696a75908b0a4259349e20823 (patch) | |
tree | 428799424b34d7911e6dd39a0ab2ef94c7900525 /manifests/preferences | |
parent | f25a8a91099d6c1ef512a5fb21581abc62e1519a (diff) | |
parent | 92aa5a51e95d74604a40318558aa98f70fcf7720 (diff) | |
download | puppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.gz puppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.bz2 |
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/preferences')
-rw-r--r-- | manifests/preferences/absent.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/manifests/preferences/absent.pp b/manifests/preferences/absent.pp index 3131aff..d8b2e10 100644 --- a/manifests/preferences/absent.pp +++ b/manifests/preferences/absent.pp @@ -1,8 +1,5 @@ class apt::preferences::absent { - include common::moduledir - $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences" - concatenated_file{'/etc/apt/preferences': - dir => $apt_preferences_dir, + file {'/etc/apt/preferences': ensure => absent, } } |